Skip to content

Commit

Permalink
V4L/DVB (7608): em28xx-dvb: Some cleanups and fixes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Devin Heitmueller authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent 6ea54d9 commit 8324402
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions drivers/media/video/em28xx/em28xx-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,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",
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/tuner-xc2028.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,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];
Expand Down

0 comments on commit 8324402

Please sign in to comment.