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 v5 35/36] i2c: tegra: Rename couple "ret" variables to "err"
Date: Sun, 6 Sep 2020 21:50:38 +0300 [thread overview]
Message-ID: <20200906185039.22700-36-digetx@gmail.com> (raw)
In-Reply-To: <20200906185039.22700-1-digetx@gmail.com>
Rename "ret" variables to "err" in order to make code a bit more
expressive, emphasizing that the returned value is a error code.
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 36 +++++++++++++++++-----------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index f15796a19688..880fbcd28c5e 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -938,7 +938,7 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len)
struct dma_slave_config slv_config = {0};
u32 val, reg, dma_burst, reg_offset;
struct dma_chan *chan;
- int ret;
+ int err;
if (i2c_dev->hw->has_mst_fifo)
reg = I2C_MST_FIFO_CONTROL;
@@ -978,10 +978,10 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len)
}
slv_config.device_fc = true;
- ret = dmaengine_slave_config(chan, &slv_config);
- if (ret) {
- dev_err(i2c_dev->dev, "DMA config failed: %d\n", ret);
- return ret;
+ err = dmaengine_slave_config(chan, &slv_config);
+ if (err) {
+ dev_err(i2c_dev->dev, "DMA config failed: %d\n", err);
+ return err;
}
goto out;
@@ -1590,11 +1590,11 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev)
{
struct device_node *np = i2c_dev->dev->of_node;
bool multi_mode;
- int ret;
+ int err;
- ret = of_property_read_u32(np, "clock-frequency",
+ err = of_property_read_u32(np, "clock-frequency",
&i2c_dev->bus_clk_rate);
- if (ret)
+ if (err)
i2c_dev->bus_clk_rate = I2C_MAX_STANDARD_MODE_FREQ;
multi_mode = of_property_read_bool(np, "multi-master");
@@ -1796,15 +1796,15 @@ static int tegra_i2c_remove(struct platform_device *pdev)
static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
{
struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
- int ret;
+ int err;
- ret = pinctrl_pm_select_default_state(i2c_dev->dev);
- if (ret)
- return ret;
+ err = pinctrl_pm_select_default_state(i2c_dev->dev);
+ if (err)
+ return err;
- ret = clk_bulk_enable(i2c_dev->nclocks, i2c_dev->clocks);
- if (ret)
- return ret;
+ err = clk_bulk_enable(i2c_dev->nclocks, i2c_dev->clocks);
+ if (err)
+ return err;
/*
* VI I2C device is attached to VE power domain which goes through
@@ -1812,8 +1812,8 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
* controller needs to be re-initialized after power ON.
*/
if (i2c_dev->is_vi) {
- ret = tegra_i2c_init(i2c_dev);
- if (ret)
+ err = tegra_i2c_init(i2c_dev);
+ if (err)
goto disable_clocks;
}
@@ -1822,7 +1822,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
disable_clocks:
clk_bulk_disable(i2c_dev->nclocks, i2c_dev->clocks);
- return ret;
+ return err;
}
static int __maybe_unused tegra_i2c_runtime_suspend(struct device *dev)
--
2.27.0
next prev parent reply other threads:[~2020-09-06 18:53 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-06 18:50 [PATCH v5 00/36] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 01/36] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer Dmitry Osipenko
2020-09-07 7:56 ` Andy Shevchenko
2020-09-07 14:31 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 02/36] i2c: tegra: Handle potential error of tegra_i2c_flush_fifos() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 03/36] i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 04/36] i2c: tegra: Initialization div-clk rate unconditionally Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 05/36] i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 06/36] i2c: tegra: Runtime PM always available on Tegra Dmitry Osipenko
2020-09-07 8:10 ` Andy Shevchenko
2020-09-07 14:31 ` Dmitry Osipenko
2020-09-07 15:05 ` Andy Shevchenko
2020-09-07 15:25 ` Dmitry Osipenko
2020-09-07 15:34 ` Andy Shevchenko
2020-09-07 16:06 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 07/36] i2c: tegra: Remove error message used for devm_request_irq() failure Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 08/36] i2c: tegra: Use reset_control_reset() Dmitry Osipenko
2020-09-07 8:13 ` Andy Shevchenko
2020-09-07 14:33 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 09/36] i2c: tegra: Use devm_platform_get_and_ioremap_resource() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 10/36] i2c: tegra: Use platform_get_irq() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 11/36] i2c: tegra: Use clk-bulk helpers Dmitry Osipenko
2020-09-07 8:21 ` Andy Shevchenko
2020-09-07 14:33 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 12/36] i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 13/36] i2c: tegra: Clean up probe function Dmitry Osipenko
2020-09-07 8:20 ` Andy Shevchenko
2020-09-07 14:33 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 14/36] i2c: tegra: Remove likely/unlikely from the code Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 15/36] i2c: tegra: Remove outdated barrier() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 16/36] i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 17/36] i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 18/36] i2c: tegra: Don't fall back to PIO mode if DMA configuration fails Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 19/36] i2c: tegra: Improve formatting of function variables Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 20/36] i2c: tegra: Improve coding style of tegra_i2c_wait_for_config_load() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 21/36] i2c: tegra: Rename wait/poll functions Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 22/36] i2c: tegra: Rename variable in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 23/36] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 24/36] i2c: tegra: Factor out packet header setup " Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 25/36] i2c: tegra: Factor out register polling into separate function Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 26/36] i2c: tegra: Factor out hardware initialization " Dmitry Osipenko
2020-09-07 8:25 ` Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 27/36] i2c: tegra: Reorder location of functions in the code Dmitry Osipenko
2020-09-07 8:27 ` Andy Shevchenko
2020-09-07 14:36 ` Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 28/36] i2c: tegra: Check errors for both positive and negative values Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 29/36] i2c: tegra: Consolidate error handling in tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 30/36] i2c: tegra: Clean up printk messages Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 31/36] i2c: tegra: Clean up whitespaces, newlines and indentation Dmitry Osipenko
2020-09-06 18:50 ` [PATCH v5 32/36] i2c: tegra: Clean up and improve comments Dmitry Osipenko
2020-09-07 8:29 ` Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 33/36] i2c: tegra: Clean up variable types Dmitry Osipenko
2020-09-07 8:30 ` Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 34/36] i2c: tegra: Improve driver module description Dmitry Osipenko
2020-09-06 18:50 ` Dmitry Osipenko [this message]
2020-09-07 8:31 ` [PATCH v5 35/36] i2c: tegra: Rename couple "ret" variables to "err" Andy Shevchenko
2020-09-06 18:50 ` [PATCH v5 36/36] i2c: tegra: Improve tegra_i2c_dev structure Dmitry Osipenko
2020-09-07 8:32 ` Andy Shevchenko
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=20200906185039.22700-36-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