diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-17 18:41:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-17 18:41:16 -0300 |
| commit | 9e6571d86577f8ff7f62488314f41c08eb0e6d5a (patch) | |
| tree | 9adc2a87b952655e4425569667882537509d0de1 /linux | |
| parent | e1f327f167fa9e97945bd55a18f3c4d002874ac2 (diff) | |
| download | mediapointer-dvb-s2-9e6571d86577f8ff7f62488314f41c08eb0e6d5a.tar.gz mediapointer-dvb-s2-9e6571d86577f8ff7f62488314f41c08eb0e6d5a.tar.bz2 | |
em28xx-dvb: Some cleanups and fixes
From: Devin Heitmueller <devin.heitmueller@gmail.com>
em28xx-dvb.c:
- Remove unneeded xc3028_ctrl structure. The driver automatically preserves
the previous value
tuner-xc2028.c:
- Make the return type for xc2028_get_reg signed, since all of the callers
are looking for "< 0" to detect errors.
Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-dvb.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-xc2028.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-dvb.c b/linux/drivers/media/video/em28xx/em28xx-dvb.c index cae256b74..f61d86d12 100644 --- a/linux/drivers/media/video/em28xx/em28xx-dvb.c +++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c @@ -223,17 +223,13 @@ static struct zl10353_config em28xx_zl10353_with_xc3028 = { static int attach_xc3028(u8 addr, struct em28xx *dev) { struct dvb_frontend *fe; - struct xc2028_ctrl ctl; struct xc2028_config cfg; memset(&cfg, 0, sizeof(cfg)); cfg.i2c_adap = &dev->i2c_adap; cfg.i2c_addr = addr; - cfg.ctrl = &ctl; cfg.callback = em28xx_tuner_callback; - em28xx_setup_xc3028(dev, &ctl); - if (!dev->dvb->frontend) { printk(KERN_ERR "%s/2: dvb frontend not attached. " "Can't attach xc3028\n", diff --git a/linux/drivers/media/video/tuner-xc2028.c b/linux/drivers/media/video/tuner-xc2028.c index f37af8ea0..bdc378692 100644 --- a/linux/drivers/media/video/tuner-xc2028.c +++ b/linux/drivers/media/video/tuner-xc2028.c @@ -145,7 +145,7 @@ struct xc2028_data { _rc; \ }) -static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val) +static int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val) { unsigned char buf[2]; unsigned char ibuf[2]; |