1 files changed, 17 insertions, 16 deletions

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 7f3a9fe9bf4e..d7b26fc6f432 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -201,7 +201,7 @@ struct imx_i2c_struct {
         void __iomem            *base;
         wait_queue_head_t       queue;
         unsigned long           i2csr;
-        unsigned int            disable_delay;
+        unsigned int            disable_delay;
         int                     stopped;
         unsigned int            ifdr; /* IMX_I2C_IFDR */
         unsigned int            cur_clk;
@@ -295,7 +295,6 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx,
         dma->chan_tx = dma_request_slave_channel(dev, "tx");
         if (!dma->chan_tx) {
                 dev_dbg(dev, "can't request DMA tx channel\n");
-                ret = -ENODEV;
                 goto fail_al;
         }
 
@@ -313,7 +312,6 @@ static void i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx,
         dma->chan_rx = dma_request_slave_channel(dev, "rx");
         if (!dma->chan_rx) {
                 dev_dbg(dev, "can't request DMA rx channel\n");
-                ret = -ENODEV;
                 goto fail_tx;
         }
 
@@ -481,8 +479,8 @@ static void i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx)
         i2c_clk_rate = clk_get_rate(i2c_imx->clk);
         if (i2c_imx->cur_clk == i2c_clk_rate)
                 return;
-        else
-                i2c_imx->cur_clk = i2c_clk_rate;
+
+        i2c_imx->cur_clk = i2c_clk_rate;
 
         div = (i2c_clk_rate + i2c_imx->bitrate - 1) / i2c_imx->bitrate;
         if (div < i2c_clk_div[0].div)
@@ -490,7 +488,8 @@ static void i2c_imx_set_clk(struct imx_i2c_struct *i2c_imx)
         else if (div > i2c_clk_div[i2c_imx->hwdata->ndivs - 1].div)
                 i = i2c_imx->hwdata->ndivs - 1;
         else
-                for (i = 0; i2c_clk_div[i].div < div; i++);
+                for (i = 0; i2c_clk_div[i].div < div; i++)
+                        ;
 
         /* Store divider value */
         i2c_imx->ifdr = i2c_clk_div[i].val;
@@ -628,9 +627,9 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
         result = wait_for_completion_timeout(
                                 &i2c_imx->dma->cmd_complete,
                                 msecs_to_jiffies(DMA_TIMEOUT));
-        if (result <= 0) {
+        if (result == 0) {
                 dmaengine_terminate_all(dma->chan_using);
-                return result ?: -ETIMEDOUT;
+                return -ETIMEDOUT;
         }
 
         /* Waiting for transfer complete. */
@@ -686,9 +685,9 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
         result = wait_for_completion_timeout(
                                 &i2c_imx->dma->cmd_complete,
                                 msecs_to_jiffies(DMA_TIMEOUT));
-        if (result <= 0) {
+        if (result == 0) {
                 dmaengine_terminate_all(dma->chan_using);
-                return result ?: -ETIMEDOUT;
+                return -ETIMEDOUT;
         }
 
         /* waiting for transfer complete. */
@@ -822,6 +821,7 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo
         /* read data */
         for (i = 0; i < msgs->len; i++) {
                 u8 len = 0;
+
                 result = i2c_imx_trx_complete(i2c_imx);
                 if (result)
                         return result;
@@ -917,15 +917,16 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter,
                 /* write/read data */
 #ifdef CONFIG_I2C_DEBUG_BUS
                 temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);
-                dev_dbg(&i2c_imx->adapter.dev, "<%s> CONTROL: IEN=%d, IIEN=%d, "
-                        "MSTA=%d, MTX=%d, TXAK=%d, RSTA=%d\n", __func__,
+                dev_dbg(&i2c_imx->adapter.dev,
+                        "<%s> CONTROL: IEN=%d, IIEN=%d, MSTA=%d, MTX=%d, TXAK=%d, RSTA=%d\n",
+                        __func__,
                         (temp & I2CR_IEN ? 1 : 0), (temp & I2CR_IIEN ? 1 : 0),
                         (temp & I2CR_MSTA ? 1 : 0), (temp & I2CR_MTX ? 1 : 0),
                         (temp & I2CR_TXAK ? 1 : 0), (temp & I2CR_RSTA ? 1 : 0));
                 temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR);
                 dev_dbg(&i2c_imx->adapter.dev,
-                        "<%s> STATUS: ICF=%d, IAAS=%d, IBB=%d, "
-                        "IAL=%d, SRW=%d, IIF=%d, RXAK=%d\n", __func__,
+                        "<%s> STATUS: ICF=%d, IAAS=%d, IBB=%d, IAL=%d, SRW=%d, IIF=%d, RXAK=%d\n",
+                        __func__,
                         (temp & I2SR_ICF ? 1 : 0), (temp & I2SR_IAAS ? 1 : 0),
                         (temp & I2SR_IBB ? 1 : 0), (temp & I2SR_IAL ? 1 : 0),
                         (temp & I2SR_SRW ? 1 : 0), (temp & I2SR_IIF ? 1 : 0),
@@ -1004,7 +1005,7 @@ static int i2c_imx_probe(struct platform_device *pdev)
         i2c_imx->adapter.owner          = THIS_MODULE;
         i2c_imx->adapter.algo           = &i2c_imx_algo;
         i2c_imx->adapter.dev.parent     = &pdev->dev;
-        i2c_imx->adapter.nr             = pdev->id;
+        i2c_imx->adapter.nr             = pdev->id;
         i2c_imx->adapter.dev.of_node    = pdev->dev.of_node;
         i2c_imx->base                   = base;
 
@@ -1063,7 +1064,7 @@ static int i2c_imx_probe(struct platform_device *pdev)
                 i2c_imx->adapter.name);
         dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n");
 
-        /* Init DMA config if support*/
+        /* Init DMA config if supported */
         i2c_imx_dma_request(i2c_imx, phy_addr);
 
         return 0;   /* Return OK */