V4L/DVB (11788): xc5000: cleanup i2c write routines

Cleanup the i2c write routine, getting rid of a passthrough function with only
one caller

Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 759168af0e2a58c2a1a1609cf96c054a746849c9..7d83deca9e02995efe8523c3a2df636d9d224965 100644 (file)
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -192,14 +192,19 @@ static struct XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {
 };
 
 static int xc5000_is_firmware_loaded(struct dvb_frontend *fe);
-static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len);
 static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val);
 static int xc5000_TunerReset(struct dvb_frontend *fe);
 
 static int xc_send_i2c_data(struct xc5000_priv *priv, u8 *buf, int len)
 {
-       return xc5000_writeregs(priv, buf, len)
-               ? XC_RESULT_I2C_WRITE_FAILURE : XC_RESULT_SUCCESS;
+       struct i2c_msg msg = { .addr = priv->i2c_props.addr,
+                              .flags = 0, .buf = buf, .len = len };
+
+       if (i2c_transfer(priv->i2c_props.adap, &msg, 1) != 1) {
+               printk(KERN_ERR "xc5000: I2C write failed (len=%i)\n", len);
+               return XC_RESULT_I2C_WRITE_FAILURE;
+       }
+       return XC_RESULT_SUCCESS;
 }
 
 /* This routine is never used because the only time we read data from the
@@ -528,19 +533,6 @@ static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
        return XC_RESULT_SUCCESS;
 }
 
-static int xc5000_writeregs(struct xc5000_priv *priv, u8 *buf, u8 len)
-{
-       struct i2c_msg msg = { .addr = priv->i2c_props.addr,
-               .flags = 0, .buf = buf, .len = len };
-
-       if (i2c_transfer(priv->i2c_props.adap, &msg, 1) != 1) {
-               printk(KERN_ERR "xc5000: I2C write failed (len=%i)\n",
-                       (int)len);
-               return -EREMOTEIO;
-       }
-       return 0;
-}
-
 static int xc5000_fwupload(struct dvb_frontend *fe)
 {
        struct xc5000_priv *priv = fe->tuner_priv;