Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 37340
b: refs/heads/master
c: 13fef93
h: refs/heads/master
v: v3
  • Loading branch information
Andrew de Quincey authored and Mauro Carvalho Chehab committed Sep 26, 2006
1 parent 3944e43 commit 5069288
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 94cbae5a1a1537ef5a402199f597e84dc5dd92cb
refs/heads/master: 13fef9335f4fe2a73e1733f8807e69711736faef
2 changes: 2 additions & 0 deletions trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
28 changes: 10 additions & 18 deletions trunk/drivers/media/dvb/frontends/isl6421.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) };
Expand Down Expand Up @@ -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) };
Expand All @@ -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;
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/frontends/isl6421.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 10 additions & 18 deletions trunk/drivers/media/dvb/frontends/lnbp21.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) };
Expand Down Expand Up @@ -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) };
Expand All @@ -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;
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/frontends/lnbp21.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/ttpci/av7110.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2219,7 +2219,7 @@ static int frontend_init(struct av7110 *av7110)
av7110->fe->ops.tuner_ops.set_params = alps_bsbe1_tuner_set_params;
av7110->fe->tuner_priv = &av7110->i2c_adap;

if (lnbp21_attach(av7110->fe, &av7110->i2c_adap, 0, 0)) {
if (lnbp21_attach(av7110->fe, &av7110->i2c_adap, 0, 0) == NULL) {
printk("dvb-ttpci: LNBP21 not found!\n");
if (av7110->fe->ops.release)
av7110->fe->ops.release(av7110->fe);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/ttpci/budget-ci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,7 @@ static void frontend_init(struct budget_ci *budget_ci)
budget_ci->budget.dvb_frontend->tuner_priv = &budget_ci->budget.i2c_adap;

budget_ci->budget.dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
if (lnbp21_attach(budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, LNBP21_LLC, 0)) {
if (lnbp21_attach(budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, LNBP21_LLC, 0) == NULL) {
printk("%s: No LNBP21 found!\n", __FUNCTION__);
if (budget_ci->budget.dvb_frontend->ops.release)
budget_ci->budget.dvb_frontend->ops.release(budget_ci->budget.dvb_frontend);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/ttpci/budget.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ static void frontend_init(struct budget *budget)
budget->dvb_frontend = s5h1420_attach(&s5h1420_config, &budget->i2c_adap);
if (budget->dvb_frontend) {
budget->dvb_frontend->ops.tuner_ops.set_params = s5h1420_tuner_set_params;
if (lnbp21_attach(budget->dvb_frontend, &budget->i2c_adap, 0, 0)) {
if (lnbp21_attach(budget->dvb_frontend, &budget->i2c_adap, 0, 0) == NULL) {
printk("%s: No LNBP21 found!\n", __FUNCTION__);
goto error_out;
}
Expand Down

0 comments on commit 5069288

Please sign in to comment.