Re: [PATCH v6 27/35] i2c: tegra: Factor out register polling into separate function

[Dmitry Osipenko]

08.09.2020 11:51, Andy Shevchenko пишет:
> On Tue, Sep 8, 2020 at 5:12 AM Dmitry Osipenko  wrote:
>>
>> Factor out register polling into a separate function in order to remove
>> boilerplate code and make code cleaner.
> 
> I'm wondering if you can make it before the patch that touches one of
> these conditionals.
> 

I guess you're meaning the "Improve coding style of
tegra_i2c_wait_for_config_load()" patch.

If yes, then it should be fine to swap the order. Although, I'm not sure
what's benefit.

Re: [PATCH v6 27/35] i2c: tegra: Factor out register polling into separate function

[Andy Shevchenko]

On Tue, Sep 8, 2020 at 5:12 AM Dmitry Osipenko  wrote:
>
> Factor out register polling into a separate function in order to remove
> boilerplate code and make code cleaner.

I'm wondering if you can make it before the patch that touches one of
these conditionals.

-- 
With Best Regards,
Andy Shevchenko

[PATCH v6 27/35] i2c: tegra: Factor out register polling into separate function

[Dmitry Osipenko]

Factor out register polling into a separate function in order to remove
boilerplate code and make code cleaner.

Reviewed-by: Michał Mirosław 
Signed-off-by: Dmitry Osipenko 
---
 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, 100);
-   else
-   err = readl_relaxed_poll_timeout(addr, val, !(val & mask),
-1000, 100);
-
+   err = tegra_i2c_poll_register(i2c_dev, offset, mask, 1000, 100);
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, 0x,
+ 1000, I2C_CONFIG_LOAD_TIMEOUT);
if (err) {
dev_warn(i2c_dev->dev, "timeout waiting for config load\n");
return err;
-- 
2.27.0