From: Devin Heitmueller <devin.heitmueller@gmail.com>
Date: Fri, 18 Apr 2008 00:41:16 +0000 (-0300)
Subject: V4L/DVB (7608): em28xx-dvb: Some cleanups and fixes
X-Git-Tag: v2.6.26-rc1~1084^2~115
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83244025e70aadd7e8baad520decf5d53d534d8f;p=linux-2.6

V4L/DVB (7608): em28xx-dvb: Some cleanups and fixes

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>
---

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 21b8f1d480..39581d976e 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -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",
diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index 95d5922eac..9dd688ec3c 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -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];