From: Dmitry Osipenko <digetx@gmail.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Laxman Dewangan" <ldewangan@nvidia.com>,
"Wolfram Sang" <wsa@the-dreams.de>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Andy Shevchenko" <andy.shevchenko@gmail.com>
Cc: linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v6 32/35] i2c: tegra: Clean up printk messages
Date: Tue, 8 Sep 2020 05:10:18 +0300 [thread overview]
Message-ID: <20200908021021.9123-33-digetx@gmail.com> (raw)
In-Reply-To: <20200908021021.9123-1-digetx@gmail.com>
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>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 37 +++++++++++++---------------------
1 file changed, 14 insertions(+), 23 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 44c75595a173..56a7f696e425 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -381,7 +381,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;
}
@@ -422,7 +423,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;
}
@@ -448,7 +449,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;
}
@@ -572,7 +573,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;
}
@@ -835,7 +836,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));
@@ -978,8 +979,7 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len)
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);
return err;
}
@@ -1079,14 +1079,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;
}
@@ -1218,12 +1217,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");
err = -ETIMEDOUT;
goto reset_hardware;
}
@@ -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");
err = -ETIMEDOUT;
goto reset_hardware;
}
--
2.27.0
next prev parent reply other threads:[~2020-09-08 2:14 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 2:09 [PATCH v6 00/35] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 01/35] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 02/35] i2c: tegra: Add missing runtime PM put Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 03/35] i2c: tegra: Handle potential error of tegra_i2c_flush_fifos() Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 04/35] i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 05/35] i2c: tegra: Initialize div-clk rate unconditionally Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 06/35] i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 07/35] i2c: tegra: Runtime PM always available on Tegra Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 08/35] i2c: tegra: Remove error message used for devm_request_irq() failure Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 09/35] i2c: tegra: Use reset_control_reset() Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 10/35] i2c: tegra: Use devm_platform_get_and_ioremap_resource() Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 11/35] i2c: tegra: Use platform_get_irq() Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 12/35] i2c: tegra: Use clk-bulk helpers Dmitry Osipenko
2020-09-08 2:09 ` [PATCH v6 13/35] i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt() Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 14/35] i2c: tegra: Clean up probe function Dmitry Osipenko
2020-09-08 8:40 ` Andy Shevchenko
2020-09-08 13:16 ` Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 15/35] i2c: tegra: Clean up variable types Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 16/35] i2c: tegra: Reorder location of functions in the code Dmitry Osipenko
2020-09-08 8:43 ` Andy Shevchenko
2020-09-08 12:55 ` Dmitry Osipenko
2020-09-08 13:03 ` Andy Shevchenko
2020-09-08 2:10 ` [PATCH v6 17/35] i2c: tegra: Remove likely/unlikely from " Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 18/35] i2c: tegra: Remove outdated barrier() Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 19/35] i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 20/35] i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 21/35] i2c: tegra: Don't fall back to PIO mode if DMA configuration fails Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 22/35] i2c: tegra: Improve formatting of variables Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 23/35] i2c: tegra: Improve coding style of tegra_i2c_wait_for_config_load() Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 24/35] i2c: tegra: Rename wait/poll functions Dmitry Osipenko
2020-09-08 8:45 ` Andy Shevchenko
2020-09-08 13:26 ` Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 25/35] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-08 8:49 ` Andy Shevchenko
2020-09-08 13:29 ` Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 26/35] i2c: tegra: Factor out packet header setup " Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 27/35] i2c: tegra: Factor out register polling into separate function Dmitry Osipenko
2020-09-08 8:51 ` Andy Shevchenko
2020-09-08 13:33 ` Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 28/35] i2c: tegra: Factor out hardware initialization " Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 29/35] i2c: tegra: Check errors for both positive and negative values Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 30/35] i2c: tegra: Consolidate error handling in tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 31/35] i2c: tegra: Clean up variable names Dmitry Osipenko
2020-09-08 2:10 ` Dmitry Osipenko [this message]
2020-09-08 2:10 ` [PATCH v6 33/35] i2c: tegra: Clean up and improve comments Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 34/35] i2c: tegra: Clean up whitespaces, newlines and indentation Dmitry Osipenko
2020-09-08 2:10 ` [PATCH v6 35/35] i2c: tegra: Improve driver module description Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200908021021.9123-33-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=ldewangan@nvidia.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=thierry.reding@gmail.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).