i2c: tegra: Rename wait/poll functions

Drop '_timeout' postfix from the wait/poll completion function names in
order to make the names shorter, making code cleaner a tad.

Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index eb62284..f8bee67 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1010,10 +1010,9 @@ out:
        i2c_writel(i2c_dev, val, reg);
 }
 
-static unsigned long
-tegra_i2c_poll_completion_timeout(struct tegra_i2c_dev *i2c_dev,
-                                 struct completion *complete,
-                                 unsigned int timeout_ms)
+static unsigned long tegra_i2c_poll_completion(struct tegra_i2c_dev *i2c_dev,
+                                              struct completion *complete,
+                                              unsigned int timeout_ms)
 {
        ktime_t ktime = ktime_get();
        ktime_t ktimeout = ktime_add_ms(ktime, timeout_ms);
@@ -1037,16 +1036,14 @@ tegra_i2c_poll_completion_timeout(struct tegra_i2c_dev *i2c_dev,
        return 0;
 }
 
-static unsigned long
-tegra_i2c_wait_completion_timeout(struct tegra_i2c_dev *i2c_dev,
-                                 struct completion *complete,
-                                 unsigned int timeout_ms)
+static unsigned long tegra_i2c_wait_completion(struct tegra_i2c_dev *i2c_dev,
+                                              struct completion *complete,
+                                              unsigned int timeout_ms)
 {
        unsigned long ret;
 
        if (i2c_dev->is_curr_atomic_xfer) {
-               ret = tegra_i2c_poll_completion_timeout(i2c_dev, complete,
-                                                       timeout_ms);
+               ret = tegra_i2c_poll_completion(i2c_dev, complete, timeout_ms);
        } else {
                enable_irq(i2c_dev->irq);
                ret = wait_for_completion_timeout(complete,
@@ -1064,8 +1061,7 @@ tegra_i2c_wait_completion_timeout(struct tegra_i2c_dev *i2c_dev,
                 * needs to be checked after timeout.
                 */
                if (ret == 0)
-                       ret = tegra_i2c_poll_completion_timeout(i2c_dev,
-                                                               complete, 0);
+                       ret = tegra_i2c_poll_completion(i2c_dev, complete, 0);
        }
 
        return ret;
@@ -1091,8 +1087,7 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)
        i2c_writel(i2c_dev, reg, I2C_BUS_CLEAR_CNFG);
        tegra_i2c_unmask_irq(i2c_dev, I2C_INT_BUS_CLR_DONE);
 
-       time_left = tegra_i2c_wait_completion_timeout(
-                       i2c_dev, &i2c_dev->msg_complete, 50);
+       time_left = tegra_i2c_wait_completion(i2c_dev, &i2c_dev->msg_complete, 50);
        tegra_i2c_mask_irq(i2c_dev, I2C_INT_BUS_CLR_DONE);
 
        if (time_left == 0) {
@@ -1244,8 +1239,9 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
                i2c_readl(i2c_dev, I2C_INT_MASK));
 
        if (i2c_dev->is_curr_dma_xfer) {
-               time_left = tegra_i2c_wait_completion_timeout(
-                               i2c_dev, &i2c_dev->dma_complete, xfer_time);
+               time_left = tegra_i2c_wait_completion(i2c_dev,
+                                                     &i2c_dev->dma_complete,
+                                                     xfer_time);
 
                /*
                 * Synchronize DMA first, since dmaengine_terminate_sync()
@@ -1276,8 +1272,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
                }
        }
 
-       time_left = tegra_i2c_wait_completion_timeout(
-                       i2c_dev, &i2c_dev->msg_complete, xfer_time);
+       time_left = tegra_i2c_wait_completion(i2c_dev, &i2c_dev->msg_complete,
+                                             xfer_time);
 
        tegra_i2c_mask_irq(i2c_dev, int_mask);