V4L/DVB: xc5000, rework xc_write_reg

Rework xc_write_reg function for correct read register of the xc5000.
It is very useful for tm6000.

Tested for tm6000 and for saa7134 works well.

Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 26 insertions, 31 deletions

diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 432003dded7c..215dad07f060 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -232,6 +232,26 @@ static int xc_read_i2c_data(struct xc5000_priv *priv, u8 *buf, int len)
         return 0;
 }
 
+static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
+{
+        u8 buf[2] = { reg >> 8, reg & 0xff };
+        u8 bval[2] = { 0, 0 };
+        struct i2c_msg msg[2] = {
+                { .addr = priv->i2c_props.addr,
+                        .flags = 0, .buf = &buf[0], .len = 2 },
+                { .addr = priv->i2c_props.addr,
+                        .flags = I2C_M_RD, .buf = &bval[0], .len = 2 },
+        };
+
+        if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {
+                printk(KERN_WARNING "xc5000: I2C read failed\n");
+                return -EREMOTEIO;
+        }
+
+        *val = (bval[0] << 8) | bval[1];
+        return XC_RESULT_SUCCESS;
+}
+
 static void xc_wait(int wait_ms)
 {
         msleep(wait_ms);
@@ -275,20 +295,14 @@ 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)) {
-                        buf[0] = 0;
-                        buf[1] = XREG_BUSY;
-
-                        result = xc_send_i2c_data(priv, buf, 2);
+                        result = xc5000_readreg(priv, XREG_BUSY, buf);
                         if (result == XC_RESULT_SUCCESS) {
-                                result = xc_read_i2c_data(priv, buf, 2);
-                                if (result == XC_RESULT_SUCCESS) {
-                                        if ((buf[0] == 0) && (buf[1] == 0)) {
-                                                /* busy flag cleared */
+                                if ((buf[0] == 0) && (buf[1] == 0)) {
+                                        /* busy flag cleared */
                                         break;
-                                        } else {
-                                                xc_wait(5); /* wait 5 ms */
-                                                WatchDogTimer--;
-                                        }
+                                } else {
+                                        xc_wait(5); /* wait 5 ms */
+                                        WatchDogTimer--;
                                 }
                         }
                 }
@@ -526,25 +540,6 @@ static int xc_tune_channel(struct xc5000_priv *priv, u32 freq_hz, int mode)
         return found;
 }
 
-static int xc5000_readreg(struct xc5000_priv *priv, u16 reg, u16 *val)
-{
-        u8 buf[2] = { reg >> 8, reg & 0xff };
-        u8 bval[2] = { 0, 0 };
-        struct i2c_msg msg[2] = {
-                { .addr = priv->i2c_props.addr,
-                        .flags = 0, .buf = &buf[0], .len = 2 },
-                { .addr = priv->i2c_props.addr,
-                        .flags = I2C_M_RD, .buf = &bval[0], .len = 2 },
-        };
-
-        if (i2c_transfer(priv->i2c_props.adap, msg, 2) != 2) {
-                printk(KERN_WARNING "xc5000: I2C read failed\n");
-                return -EREMOTEIO;
-        }
-
-        *val = (bval[0] << 8) | bval[1];
-        return XC_RESULT_SUCCESS;
-}
 
 static int xc5000_fwupload(struct dvb_frontend *fe)
 {