i2c: imx: Make sure to unregister adapter on remove()

[platform/kernel/linux-rpi.git] / drivers / i2c / busses / i2c-imx.c

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index dc5ca71..3f40995 100644 (file)
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -170,11 +170,11 @@ enum imx_i2c_type {
 
 struct imx_i2c_hwdata {
        enum imx_i2c_type       devtype;
-       unsigned                regshift;
+       unsigned int            regshift;
        struct imx_i2c_clk_pair *clk_div;
-       unsigned                ndivs;
-       unsigned                i2sr_clr_opcode;
-       unsigned                i2cr_ien_opcode;
+       unsigned int            ndivs;
+       unsigned int            i2sr_clr_opcode;
+       unsigned int            i2cr_ien_opcode;
 };
 
 struct imx_i2c_dma {
@@ -423,7 +423,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx,
        return 0;
 
 err_submit:
-       dmaengine_terminate_all(dma->chan_using);
+       dmaengine_terminate_sync(dma->chan_using);
 err_desc:
        dma_unmap_single(chan_dev, dma->dma_buf,
                        dma->dma_len, dma->dma_data_dir);
@@ -452,8 +452,6 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy, bool a
        unsigned long orig_jiffies = jiffies;
        unsigned int temp;
 
-       dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
-
        while (1) {
                temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR);
 
@@ -599,8 +597,6 @@ static int i2c_imx_start(struct imx_i2c_struct *i2c_imx, bool atomic)
        unsigned int temp = 0;
        int result;
 
-       dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
-
        imx_i2c_write_reg(i2c_imx->ifdr, i2c_imx, IMX_I2C_IFDR);
        /* Enable I2C controller */
        imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
@@ -635,7 +631,6 @@ static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx, bool atomic)
 
        if (!i2c_imx->stopped) {
                /* Stop I2C transaction */
-               dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
                temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);
                if (!(temp & I2CR_MSTA))
                        i2c_imx->stopped = 1;
@@ -899,7 +894,7 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx,
                                &i2c_imx->dma->cmd_complete,
                                msecs_to_jiffies(DMA_TIMEOUT));
        if (time_left == 0) {
-               dmaengine_terminate_all(dma->chan_using);
+               dmaengine_terminate_sync(dma->chan_using);
                return -ETIMEDOUT;
        }
 
@@ -954,7 +949,7 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx,
                                &i2c_imx->dma->cmd_complete,
                                msecs_to_jiffies(DMA_TIMEOUT));
        if (time_left == 0) {
-               dmaengine_terminate_all(dma->chan_using);
+               dmaengine_terminate_sync(dma->chan_using);
                return -ETIMEDOUT;
        }
 
@@ -1167,8 +1162,6 @@ static int i2c_imx_xfer_common(struct i2c_adapter *adapter,
        bool is_lastmsg = false;
        struct imx_i2c_struct *i2c_imx = i2c_get_adapdata(adapter);
 
-       dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
-
        /* Start I2C transfer */
        result = i2c_imx_start(i2c_imx, atomic);
        if (result) {
@@ -1371,8 +1364,6 @@ static int i2c_imx_probe(struct platform_device *pdev)
        dma_addr_t phy_addr;
        const struct imx_i2c_hwdata *match;
 
-       dev_dbg(&pdev->dev, "<%s>\n", __func__);
-
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
                return irq;
@@ -1395,7 +1386,7 @@ static int i2c_imx_probe(struct platform_device *pdev)
                                platform_get_device_id(pdev)->driver_data;
 
        /* Setup i2c_imx driver structure */
-       strlcpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name));
+       strscpy(i2c_imx->adapter.name, pdev->name, sizeof(i2c_imx->adapter.name));
        i2c_imx->adapter.owner          = THIS_MODULE;
        i2c_imx->adapter.algo           = &i2c_imx_algo;
        i2c_imx->adapter.dev.parent     = &pdev->dev;
@@ -1496,9 +1487,7 @@ static int i2c_imx_remove(struct platform_device *pdev)
        struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev);
        int irq, ret;
 
-       ret = pm_runtime_resume_and_get(&pdev->dev);
-       if (ret < 0)
-               return ret;
+       ret = pm_runtime_get_sync(&pdev->dev);
 
        /* remove adapter */
        dev_dbg(&i2c_imx->adapter.dev, "adapter removed\n");
@@ -1507,17 +1496,21 @@ static int i2c_imx_remove(struct platform_device *pdev)
        if (i2c_imx->dma)
                i2c_imx_dma_free(i2c_imx);
 
-       /* setup chip registers to defaults */
-       imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IADR);
-       imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IFDR);
-       imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2CR);
-       imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2SR);
+       if (ret == 0) {
+               /* setup chip registers to defaults */
+               imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IADR);
+               imx_i2c_write_reg(0, i2c_imx, IMX_I2C_IFDR);
+               imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2CR);
+               imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2SR);
+               clk_disable(i2c_imx->clk);
+       }
 
        clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
        irq = platform_get_irq(pdev, 0);
        if (irq >= 0)
                free_irq(irq, i2c_imx);
-       clk_disable_unprepare(i2c_imx->clk);
+
+       clk_unprepare(i2c_imx->clk);
 
        pm_runtime_put_noidle(&pdev->dev);
        pm_runtime_disable(&pdev->dev);