i2c: tegra: Clean up printk messages

This patch unifies style of all messages in the driver by starting them
with a lowercase letter and using consistent capitalization and wording
for all messages.

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 1a13883..dbf8342 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -382,7 +382,8 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev *i2c_dev, size_t len)
                                               len, dir, DMA_PREP_INTERRUPT |
                                               DMA_CTRL_ACK);
        if (!dma_desc) {
-               dev_err(i2c_dev->dev, "failed to get DMA descriptor\n");
+               dev_err(i2c_dev->dev, "failed to get %s DMA descriptor\n",
+                       i2c_dev->msg_read ? "RX" : "TX");
                return -EINVAL;
        }
 
@@ -423,7 +424,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
                return 0;
 
        if (!IS_ENABLED(CONFIG_TEGRA20_APB_DMA)) {
-               dev_dbg(i2c_dev->dev, "Support for APB DMA not enabled!\n");
+               dev_dbg(i2c_dev->dev, "DMA support not enabled\n");
                return 0;
        }
 
@@ -449,7 +450,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
        dma_buf = dma_alloc_coherent(i2c_dev->dev, i2c_dev->dma_buf_size,
                                     &dma_phys, GFP_KERNEL | __GFP_NOWARN);
        if (!dma_buf) {
-               dev_err(i2c_dev->dev, "failed to allocate the DMA buffer\n");
+               dev_err(i2c_dev->dev, "failed to allocate DMA buffer\n");
                err = -ENOMEM;
                goto err_out;
        }
@@ -573,7 +574,7 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)
        err = tegra_i2c_poll_register(i2c_dev, I2C_CONFIG_LOAD, 0xffffffff,
                                      1000, I2C_CONFIG_LOAD_TIMEOUT);
        if (err) {
-               dev_warn(i2c_dev->dev, "timeout waiting for config load\n");
+               dev_err(i2c_dev->dev, "failed to load config\n");
                return err;
        }
 
@@ -836,7 +837,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
        status = i2c_readl(i2c_dev, I2C_INT_STATUS);
 
        if (status == 0) {
-               dev_warn(i2c_dev->dev, "irq status 0 %08x %08x %08x\n",
+               dev_warn(i2c_dev->dev, "IRQ status 0 %08x %08x %08x\n",
                         i2c_readl(i2c_dev, I2C_PACKET_TRANSFER_STATUS),
                         i2c_readl(i2c_dev, I2C_STATUS),
                         i2c_readl(i2c_dev, I2C_CNFG));
@@ -980,8 +981,7 @@ static void tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev,
                slv_config.device_fc = true;
                err = dmaengine_slave_config(chan, &slv_config);
                if (err) {
-                       dev_err(i2c_dev->dev, "DMA slave config failed: %d\n",
-                               err);
+                       dev_err(i2c_dev->dev, "DMA config failed: %d\n", err);
                        dev_err(i2c_dev->dev, "falling back to PIO\n");
                        tegra_i2c_release_dma(i2c_dev);
                        i2c_dev->dma_mode = false;
@@ -1080,14 +1080,13 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)
        tegra_i2c_mask_irq(i2c_dev, I2C_INT_BUS_CLR_DONE);
 
        if (time_left == 0) {
-               dev_err(i2c_dev->dev, "timed out for bus clear\n");
+               dev_err(i2c_dev->dev, "failed to clear bus\n");
                return -ETIMEDOUT;
        }
 
        val = i2c_readl(i2c_dev, I2C_BUS_CLEAR_STATUS);
        if (!(val & I2C_BC_STATUS)) {
-               dev_err(i2c_dev->dev,
-                       "un-recovered arbitration lost\n");
+               dev_err(i2c_dev->dev, "un-recovered arbitration lost\n");
                return -EIO;
        }
 
@@ -1217,12 +1216,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
                                                   xfer_size,
                                                   DMA_FROM_DEVICE);
                        err = tegra_i2c_dma_submit(i2c_dev, xfer_size);
-                       if (err) {
-                               dev_err(i2c_dev->dev,
-                                       "starting RX DMA failed, err %d\n",
-                                       err);
+                       if (err)
                                return err;
-                       }
 
                } else {
                        dma_sync_single_for_cpu(i2c_dev->dev,
@@ -1243,12 +1238,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
                                                   xfer_size,
                                                   DMA_TO_DEVICE);
                        err = tegra_i2c_dma_submit(i2c_dev, xfer_size);
-                       if (err) {
-                               dev_err(i2c_dev->dev,
-                                       "starting TX DMA failed, err %d\n",
-                                       err);
+                       if (err)
                                return err;
-                       }
                } else {
                        tegra_i2c_fill_tx_fifo(i2c_dev);
                }
@@ -1264,7 +1255,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
        }
 
        tegra_i2c_unmask_irq(i2c_dev, int_mask);
-       dev_dbg(i2c_dev->dev, "unmasked irq: %02x\n",
+       dev_dbg(i2c_dev->dev, "unmasked IRQ: %02x\n",
                i2c_readl(i2c_dev, I2C_INT_MASK));
 
        if (i2c_dev->dma_mode) {
@@ -1286,7 +1277,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
                                         i2c_dev->tx_dma_chan);
 
                if (!time_left && !completion_done(&i2c_dev->dma_complete)) {
-                       dev_err(i2c_dev->dev, "DMA transfer timeout\n");
+                       dev_err(i2c_dev->dev, "DMA transfer timed out\n");
                        tegra_i2c_init(i2c_dev);
                        return -ETIMEDOUT;
                }
@@ -1307,7 +1298,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
        tegra_i2c_mask_irq(i2c_dev, int_mask);
 
        if (time_left == 0) {
-               dev_err(i2c_dev->dev, "i2c transfer timed out\n");
+               dev_err(i2c_dev->dev, "I2C transfer timed out\n");
                tegra_i2c_init(i2c_dev);
                return -ETIMEDOUT;
        }