mxc_i2c: create i2c_init_transfer

Initial code of i2c_read and i2c_write
is identical, move to subroutine.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Stefano Babic <sbabic@denx.de>

diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 57027ad4db5822349d8ea5e8741dde899c7050b9..4ce695a52d0d9a93d213f3a6f3e572e6ead6bd3b 100644 (file)
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -275,19 +275,29 @@ void i2c_imx_stop(void)
 }
 
 /*
- * Write register address
+ * Send start signal, chip address and
+ * write register address
  */
-int i2c_imx_set_reg_addr(uint addr, int alen)
+static int i2c_init_transfer(struct mxc_i2c_regs *i2c_regs,
+               uchar chip, uint addr, int alen)
 {
-       struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
-       int ret = 0;
+       int ret = i2c_imx_start();
+       if (ret)
+               goto exit;
+
+       /* write slave address */
+       ret = tx_byte(i2c_regs, chip << 1);
+       if (ret < 0)
+               goto exit;
 
        while (alen--) {
                ret = tx_byte(i2c_regs, (addr >> (alen * 8)) & 0xff);
                if (ret < 0)
-                       break;
+                       goto exit;
        }
-
+       return 0;
+exit:
+       i2c_imx_stop();
        return ret;
 }
 
@@ -318,19 +328,10 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
        unsigned int temp;
        int i;
 
-       ret = i2c_imx_start();
-       if (ret)
-               return ret;
-
-       /* write slave address */
-       ret = tx_byte(i2c_regs, chip << 1);
+       ret = i2c_init_transfer(i2c_regs, chip, addr, alen);
        if (ret < 0)
                return ret;
 
-       ret = i2c_imx_set_reg_addr(addr, alen);
-       if (ret)
-               return ret;
-
        temp = readb(&i2c_regs->i2cr);
        temp |= I2CR_RSTA;
        writeb(temp, &i2c_regs->i2cr);
@@ -387,19 +388,10 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
        int ret;
        int i;
 
-       ret = i2c_imx_start();
-       if (ret)
-               return ret;
-
-       /* write slave address */
-       ret = tx_byte(i2c_regs, chip << 1);
+       ret = i2c_init_transfer(i2c_regs, chip, addr, alen);
        if (ret < 0)
                return ret;
 
-       ret = i2c_imx_set_reg_addr(addr, alen);
-       if (ret)
-               return ret;
-
        for (i = 0; i < len; i++) {
                ret = tx_byte(i2c_regs, buf[i]);
                if (ret < 0)