V4L/DVB: xc5000: Fix a few warnings
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 5 Jul 2010 21:38:46 +0000 (18:38 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 2 Aug 2010 18:31:59 +0000 (15:31 -0300)
drivers/media/common/tuners/xc5000.c: In function ‘xc_write_reg’:
drivers/media/common/tuners/xc5000.c:298: warning: passing argument 3 of ‘xc5000_readreg’ from incompatible pointer type
drivers/media/common/tuners/xc5000.c:235: note: expected ‘u16 *’ but argument is of type ‘u8 *’
drivers/media/common/tuners/xc5000.c: At top level:
drivers/media/common/tuners/xc5000.c:223: warning: ‘xc_read_i2c_data’ defined but not used

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/tuners/xc5000.c

index 215dad07f060db61fd478e050a5e8f8637283495..d2b2c12a55618083871f154cb0dda7fb6062b565 100644 (file)
@@ -217,6 +217,7 @@ static int xc_send_i2c_data(struct xc5000_priv *priv, u8 *buf, int len)
        return XC_RESULT_SUCCESS;
 }
 
+#if 0
 /* This routine is never used because the only time we read data from the
    i2c bus is when we read registers, and we want that to be an atomic i2c
    transaction in case we are on a multi-master bus */
@@ -231,6 +232,7 @@ static int xc_read_i2c_data(struct xc5000_priv *priv, u8 *buf, int len)
        }
        return 0;
 }
+#endif
 
 static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
 {
@@ -295,7 +297,7 @@ static int xc_write_reg(struct xc5000_priv *priv, u16 regAddr, u16 i2cData)
        if (result == XC_RESULT_SUCCESS) {
                /* wait for busy flag to clear */
                while ((WatchDogTimer > 0) && (result == XC_RESULT_SUCCESS)) {
-                       result = xc5000_readreg(priv, XREG_BUSY, buf);
+                       result = xc5000_readreg(priv, XREG_BUSY, (u16 *)buf);
                        if (result == XC_RESULT_SUCCESS) {
                                if ((buf[0] == 0) && (buf[1] == 0)) {
                                        /* busy flag cleared */