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 27/35] i2c: tegra: Factor out register polling into separate function
Date: Tue, 8 Sep 2020 05:10:13 +0300 [thread overview]
Message-ID: <20200908021021.9123-28-digetx@gmail.com> (raw)
In-Reply-To: <20200908021021.9123-1-digetx@gmail.com>
Factor out register polling into a separate function in order to remove
boilerplate code and make code cleaner.
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 43 +++++++++++++++-------------------
1 file changed, 19 insertions(+), 24 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 7d54b8b3ed9a..2e7beadd381f 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -518,10 +518,24 @@ static void tegra_i2c_vi_init(struct tegra_i2c_dev *i2c_dev)
i2c_writel(i2c_dev, 0x0, I2C_TLOW_SEXT);
}
+static int tegra_i2c_poll_register(struct tegra_i2c_dev *i2c_dev,
+ u32 reg, u32 mask, u32 delay_us,
+ u32 timeout_us)
+{
+ void __iomem *addr = i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg);
+ u32 val;
+
+ if (!i2c_dev->is_curr_atomic_xfer)
+ return readl_relaxed_poll_timeout(addr, val, !(val & mask),
+ delay_us, timeout_us);
+
+ return readl_relaxed_poll_timeout_atomic(addr, val, !(val & mask),
+ delay_us, timeout_us);
+}
+
static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
{
- u32 mask, val, offset, reg_offset;
- void __iomem *addr;
+ u32 mask, val, offset;
int err;
if (i2c_dev->hw->has_mst_fifo) {
@@ -538,16 +552,7 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
val |= mask;
i2c_writel(i2c_dev, val, offset);
- reg_offset = tegra_i2c_reg_addr(i2c_dev, offset);
- addr = i2c_dev->base + reg_offset;
-
- if (i2c_dev->is_curr_atomic_xfer)
- err = readl_relaxed_poll_timeout_atomic(addr, val, !(val & mask),
- 1000, 1000000);
- else
- err = readl_relaxed_poll_timeout(addr, val, !(val & mask),
- 1000, 1000000);
-
+ err = tegra_i2c_poll_register(i2c_dev, offset, mask, 1000, 1000000);
if (err) {
dev_err(i2c_dev->dev, "failed to flush FIFO\n");
return err;
@@ -557,25 +562,15 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)
{
- unsigned long reg_offset;
- void __iomem *addr;
- u32 val;
int err;
if (!i2c_dev->hw->has_config_load_reg)
return 0;
- reg_offset = tegra_i2c_reg_addr(i2c_dev, I2C_CONFIG_LOAD);
- addr = i2c_dev->base + reg_offset;
i2c_writel(i2c_dev, I2C_MSTR_CONFIG_LOAD, I2C_CONFIG_LOAD);
- if (i2c_dev->is_curr_atomic_xfer)
- err = readl_relaxed_poll_timeout_atomic(addr, val, val == 0, 1000,
- I2C_CONFIG_LOAD_TIMEOUT);
- else
- err = readl_relaxed_poll_timeout(addr, val, val == 0, 1000,
- I2C_CONFIG_LOAD_TIMEOUT);
-
+ 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");
return err;
--
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 ` Dmitry Osipenko [this message]
2020-09-08 8:51 ` [PATCH v6 27/35] i2c: tegra: Factor out register polling into separate function 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 ` [PATCH v6 32/35] i2c: tegra: Clean up printk messages Dmitry Osipenko
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-28-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).