[PATCH 4.4 07/21] mfd: atmel-hlcdc: Do not sleep in atomic context

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: Boris Brezillon 

commit 2c2469bc03d569c49119db2cccb5cb3f0c6a5b33 upstream.

readl_poll_timeout() calls usleep_range(), but
regmap_atmel_hlcdc_reg_write() is called in atomic context (regmap
spinlock held).

Replace the readl_poll_timeout() call by readl_poll_timeout_atomic().

Fixes: ea31c0cf9b07 ("mfd: atmel-hlcdc: Implement config synchronization")
Signed-off-by: Boris Brezillon 
Signed-off-by: Lee Jones 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/mfd/atmel-hlcdc.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/mfd/atmel-hlcdc.c
+++ b/drivers/mfd/atmel-hlcdc.c
@@ -50,8 +50,9 @@ static int regmap_atmel_hlcdc_reg_write(
if (reg <= ATMEL_HLCDC_DIS) {
u32 status;
 
-   readl_poll_timeout(hregmap->regs + ATMEL_HLCDC_SR, status,
-  !(status & ATMEL_HLCDC_SIP), 1, 100);
+   readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR,
+ status, !(status & ATMEL_HLCDC_SIP),
+ 1, 100);
}
 
writel(val, hregmap->regs + reg);

[PATCH 4.4 07/21] mfd: atmel-hlcdc: Do not sleep in atomic context

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: Boris Brezillon 

commit 2c2469bc03d569c49119db2cccb5cb3f0c6a5b33 upstream.

readl_poll_timeout() calls usleep_range(), but
regmap_atmel_hlcdc_reg_write() is called in atomic context (regmap
spinlock held).

Replace the readl_poll_timeout() call by readl_poll_timeout_atomic().

Fixes: ea31c0cf9b07 ("mfd: atmel-hlcdc: Implement config synchronization")
Signed-off-by: Boris Brezillon 
Signed-off-by: Lee Jones 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/mfd/atmel-hlcdc.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/mfd/atmel-hlcdc.c
+++ b/drivers/mfd/atmel-hlcdc.c
@@ -50,8 +50,9 @@ static int regmap_atmel_hlcdc_reg_write(
if (reg <= ATMEL_HLCDC_DIS) {
u32 status;
 
-   readl_poll_timeout(hregmap->regs + ATMEL_HLCDC_SR, status,
-  !(status & ATMEL_HLCDC_SIP), 1, 100);
+   readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR,
+ status, !(status & ATMEL_HLCDC_SIP),
+ 1, 100);
}
 
writel(val, hregmap->regs + reg);