Commit 13fef933 authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4383): Convert SEC drivers to new frontend API 



Convert SEC drivers to new frontend API

Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Acked-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Acked-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 94cbae5a

drivers/media/dvb/dvb-core/dvb_frontend.c

+2 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,8 @@ int dvb_unregister_frontend(struct dvb_frontend* fe) 
	mutex_lock(&frontend_mutex);

	dvb_unregister_device (fepriv->dvbdev);

	dvb_frontend_stop (fe);

	if (fe->ops.release_sec)

		fe->ops.release_sec(fe);

	if (fe->ops.tuner_ops.release) {

		fe->ops.tuner_ops.release(fe);

		if (fe->ops.i2c_gate_ctrl)

drivers/media/dvb/frontends/isl6421.c

+10 −18
Original line number Diff line number Diff line
@@ -42,12 +42,11 @@ struct isl6421 { 
	u8			override_and;

	struct i2c_adapter	*i2c;

	u8			i2c_addr;

	void			(*release_chain)(struct dvb_frontend* fe);

};



static int isl6421_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)

{

	struct isl6421 *isl6421 = (struct isl6421 *) fe->misc_priv;

	struct isl6421 *isl6421 = (struct isl6421 *) fe->sec_priv;

	struct i2c_msg msg = {	.addr = isl6421->i2c_addr, .flags = 0,

				.buf = &isl6421->config,

				.len = sizeof(isl6421->config) };
@@ -75,7 +74,7 @@ static int isl6421_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage 


static int isl6421_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)

{

	struct isl6421 *isl6421 = (struct isl6421 *) fe->misc_priv;

	struct isl6421 *isl6421 = (struct isl6421 *) fe->sec_priv;

	struct i2c_msg msg = {	.addr = isl6421->i2c_addr, .flags = 0,

				.buf = &isl6421->config,

				.len = sizeof(isl6421->config) };
@@ -93,31 +92,26 @@ static int isl6421_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg) 


static void isl6421_release(struct dvb_frontend *fe)

{

	struct isl6421 *isl6421 = (struct isl6421 *) fe->misc_priv;



	/* power off */

	isl6421_set_voltage(fe, SEC_VOLTAGE_OFF);



	/* free data & call next release routine */

	fe->ops.release = isl6421->release_chain;

	kfree(fe->misc_priv);

	fe->misc_priv = NULL;

	if (fe->ops.release)

		fe->ops.release(fe);

	/* free */

	kfree(fe->sec_priv);

	fe->sec_priv = NULL;

}



int isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,

struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,

		   u8 override_set, u8 override_clear)

{

	struct isl6421 *isl6421 = kmalloc(sizeof(struct isl6421), GFP_KERNEL);

	if (!isl6421)

		return -ENOMEM;

		return NULL;



	/* default configuration */

	isl6421->config = ISL6421_ISEL1;

	isl6421->i2c = i2c;

	isl6421->i2c_addr = i2c_addr;

	fe->misc_priv = isl6421;

	fe->sec_priv = isl6421;



	/* bits which should be forced to '1' */

	isl6421->override_or = override_set;
@@ -128,19 +122,17 @@ int isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr 
	/* detect if it is present or not */

	if (isl6421_set_voltage(fe, SEC_VOLTAGE_OFF)) {

		kfree(isl6421);

		fe->misc_priv = NULL;

		return -EIO;

		return NULL;

	}



	/* install release callback */

	isl6421->release_chain = fe->ops.release;

	fe->ops.release = isl6421_release;



	/* override frontend ops */

	fe->ops.set_voltage = isl6421_set_voltage;

	fe->ops.enable_high_lnb_voltage = isl6421_enable_high_lnb_voltage;



	return 0;

	return fe;

}

EXPORT_SYMBOL(isl6421_attach);

drivers/media/dvb/frontends/isl6421.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
#define ISL6421_DCL	0x40



/* override_set and override_clear control which system register bits (above) to always set & clear */

extern int isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,

extern struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr,

			  u8 override_set, u8 override_clear);



#endif

drivers/media/dvb/frontends/lnbp21.c

+10 −18
Original line number Diff line number Diff line
@@ -40,12 +40,11 @@ struct lnbp21 { 
	u8			override_or;

	u8			override_and;

	struct i2c_adapter	*i2c;

	void			(*release_chain)(struct dvb_frontend* fe);

};



static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)

{

	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;

	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->sec_priv;

	struct i2c_msg msg = {	.addr = 0x08, .flags = 0,

				.buf = &lnbp21->config,

				.len = sizeof(lnbp21->config) };
@@ -73,7 +72,7 @@ static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) 


static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)

{

	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;

	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->sec_priv;

	struct i2c_msg msg = {	.addr = 0x08, .flags = 0,

				.buf = &lnbp21->config,

				.len = sizeof(lnbp21->config) };
@@ -91,29 +90,24 @@ static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg) 


static void lnbp21_release(struct dvb_frontend *fe)

{

	struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;



	/* LNBP power off */

	lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);



	/* free data & call next release routine */

	fe->ops.release = lnbp21->release_chain;

	kfree(fe->misc_priv);

	fe->misc_priv = NULL;

	if (fe->ops.release)

		fe->ops.release(fe);

	/* free data */

	kfree(fe->sec_priv);

	fe->sec_priv = NULL;

}



int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)

struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)

{

	struct lnbp21 *lnbp21 = kmalloc(sizeof(struct lnbp21), GFP_KERNEL);

	if (!lnbp21)

		return -ENOMEM;

		return NULL;



	/* default configuration */

	lnbp21->config = LNBP21_ISEL;

	lnbp21->i2c = i2c;

	fe->misc_priv = lnbp21;

	fe->sec_priv = lnbp21;



	/* bits which should be forced to '1' */

	lnbp21->override_or = override_set;
@@ -124,19 +118,17 @@ int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_ 
	/* detect if it is present or not */

	if (lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF)) {

		kfree(lnbp21);

		fe->misc_priv = NULL;

		return -EIO;

		return NULL;

	}



	/* install release callback */

	lnbp21->release_chain = fe->ops.release;

	fe->ops.release = lnbp21_release;



	/* override frontend ops */

	fe->ops.set_voltage = lnbp21_set_voltage;

	fe->ops.enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;



	return 0;

	return fe;

}

EXPORT_SYMBOL(lnbp21_attach);

drivers/media/dvb/frontends/lnbp21.h

+1 −1
Original line number Diff line number Diff line
@@ -40,6 +40,6 @@ 
#include <linux/dvb/frontend.h>



/* override_set and override_clear control which system register bits (above) to always set & clear */

extern int lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear);

extern struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear);



#endif