diff mbox

[v10,3/4] i2c: tegra: use atomic poll function during configuration

Message ID 1472584279-19924-3-git-send-email-smohammed@nvidia.com
State Superseded, archived
Delegated to: Jon Hunter
Headers show

Commit Message

Shardar Shariff Md Aug. 30, 2016, 7:11 p.m. UTC
Use readl_poll_timeout_atomic() function as *wait_for_config_load()
function can be called from atomic context.

Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>

---
Changes in v10:
- Rebase on top of [PATCH V2 0/9] Some Tegra I2C Updates
---
---
 drivers/i2c/busses/i2c-tegra.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Wolfram Sang Aug. 30, 2016, 8:30 p.m. UTC | #1
On Wed, Aug 31, 2016 at 12:41:18AM +0530, Shardar Shariff Md wrote:
> Use readl_poll_timeout_atomic() function as *wait_for_config_load()
> function can be called from atomic context.
> 
> Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>

    CHECKPATCH
ERROR: do not use in_atomic in drivers
#23: FILE: drivers/i2c/busses/i2c-tegra.c:460:
+		if (in_atomic() || irqs_disabled())
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 5e94056..840a9d3 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -457,8 +457,13 @@  static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)
 		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);
-		err = readl_poll_timeout(addr, val, val == 0, 1000,
-					 I2C_CONFIG_LOAD_TIMEOUT);
+		if (in_atomic() || irqs_disabled())
+			err = readl_poll_timeout_atomic(addr, val, val == 0,
+					1000, I2C_CONFIG_LOAD_TIMEOUT);
+		else
+			err = readl_poll_timeout(addr, val, val == 0,
+					1000, I2C_CONFIG_LOAD_TIMEOUT);
+
 		if (err) {
 			dev_warn(i2c_dev->dev,
 				 "timeout waiting for config load\n");