diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-21 16:00:59 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-05 01:20:34 +0100 |
| commit | 3d49700fb162a3bc8e21bf3f304346d2e6269b3a (patch) | |
| tree | ce5a7edc0aeb47c7491fb94f24753b83a92a6a62 | |
| parent | [media] mt2063: Simplify mt2063_setTune logic (diff) | |
| download | linux-3d49700fb162a3bc8e21bf3f304346d2e6269b3a.tar.xz linux-3d49700fb162a3bc8e21bf3f304346d2e6269b3a.zip | |
[media] mt2063: Rework on the publicly-exported functions
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/common/tuners/mt2063.c | 44 | ||||
| -rw-r--r-- | drivers/media/common/tuners/mt2063.h | 2 |
2 files changed, 14 insertions, 32 deletions
diff --git a/drivers/media/common/tuners/mt2063.c b/drivers/media/common/tuners/mt2063.c index 53e3960eb7c0..0bf629292fe4 100644 --- a/drivers/media/common/tuners/mt2063.c +++ b/drivers/media/common/tuners/mt2063.c @@ -320,53 +320,34 @@ static u32 MT2063_SoftwareShutdown(struct mt2063_state *state, u8 Shutdown); static u32 MT2063_ClearPowerMaskBits(struct mt2063_state *state, enum MT2063_Mask_Bits Bits); -/*****************/ -/* From drivers/media/common/tuners/mt2063_cfg.h */ - - +/* + * Ancillary routines visible outside mt2063 + */ unsigned int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe) { struct mt2063_state *state = fe->tuner_priv; - struct dvb_frontend_ops *frontend_ops = &fe->ops; - struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops; int err = 0; - if (&fe->ops) - frontend_ops = &fe->ops; - if (&frontend_ops->tuner_ops) - tuner_ops = &frontend_ops->tuner_ops; - if (tuner_ops->set_state) { - err = MT2063_SoftwareShutdown(state, 1); - if (err < 0) { - printk("%s: Invalid parameter\n", __func__); - return err; - } - } + err = MT2063_SoftwareShutdown(state, 1); + if (err < 0) + printk(KERN_ERR "%s: Couldn't shutdown\n", __func__); return err; } +EXPORT_SYMBOL_GPL(tuner_MT2063_SoftwareShutdown); unsigned int tuner_MT2063_ClearPowerMaskBits(struct dvb_frontend *fe) { struct mt2063_state *state = fe->tuner_priv; - struct dvb_frontend_ops *frontend_ops = &fe->ops; - struct dvb_tuner_ops *tuner_ops = &frontend_ops->tuner_ops; int err = 0; - if (&fe->ops) - frontend_ops = &fe->ops; - if (&frontend_ops->tuner_ops) - tuner_ops = &frontend_ops->tuner_ops; - if (tuner_ops->set_state) { - err = MT2063_ClearPowerMaskBits(state, MT2063_ALL_SD); - if (err < 0) { - printk("%s: Invalid parameter\n", __func__); - return err; - } - } + err = MT2063_ClearPowerMaskBits(state, MT2063_ALL_SD); + if (err < 0) + printk(KERN_ERR "%s: Invalid parameter\n", __func__); return err; } +EXPORT_SYMBOL_GPL(tuner_MT2063_ClearPowerMaskBits); /* * mt2063_write - Write data into the I2C bus @@ -1173,6 +1154,7 @@ unsigned int mt2063_lockStatus(struct mt2063_state *state) */ return 0; } +EXPORT_SYMBOL_GPL(mt2063_lockStatus); /**************************************************************************** ** @@ -3333,8 +3315,8 @@ error: kfree(state); return NULL; } +EXPORT_SYMBOL_GPL(mt2063_attach); -EXPORT_SYMBOL(mt2063_attach); MODULE_PARM_DESC(verbose, "Set Verbosity level"); MODULE_AUTHOR("Henry"); diff --git a/drivers/media/common/tuners/mt2063.h b/drivers/media/common/tuners/mt2063.h index 27273bfef5d6..a95c11e1e26e 100644 --- a/drivers/media/common/tuners/mt2063.h +++ b/drivers/media/common/tuners/mt2063.h @@ -27,8 +27,8 @@ unsigned int mt2063_setTune(struct dvb_frontend *fe, u32 f_in, u32 bw_in, enum MTTune_atv_standard tv_type); +/* FIXME: Should use the standard DVB attachment interfaces */ unsigned int mt2063_lockStatus(struct dvb_frontend *fe); -unsigned int tuner_MT2063_Open(struct dvb_frontend *fe); unsigned int tuner_MT2063_SoftwareShutdown(struct dvb_frontend *fe); unsigned int tuner_MT2063_ClearPowerMaskBits(struct dvb_frontend *fe); |