fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / media / dvb / frontends / lnbp21.c

diff --git a/drivers/media/dvb/frontends/lnbp21.c b/drivers/media/dvb/frontends/lnbp21.c
index e933edc..2d2f58c 100644 (file)
--- a/drivers/media/dvb/frontends/lnbp21.c
+++ b/drivers/media/dvb/frontends/lnbp21.c
@@ -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;
+       fe->ops.release_sec = 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);