android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: sh-msiof: Use readl_poll_timeout_atomic() instead of open-coding

Browse Source 
Replace the open-coded loop in sh_msiof_modify_ctr_wait() by a call to
the readl_poll_timeout_atomic() helper macro.

Suggested-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Geert Uytterhoeven
2019-04-02 16:40:22 +02:00
committed by Mark Brown
parent 8863eca8c4
commit 9115b4d89b
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/spi/spi-sh-msiof.c
View File

@ -18,6 +18,7 @@
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
@ -219,21 +220,14 @@ static int sh_msiof_modify_ctr_wait(struct sh_msiof_spi_priv *p,
{ {
u32 mask = clr | set; u32 mask = clr | set;
u32 data; u32 data;
int k;
data = sh_msiof_read(p, CTR); data = sh_msiof_read(p, CTR);
data &= ~clr; data &= ~clr;
data |= set; data |= set;
sh_msiof_write(p, CTR, data); sh_msiof_write(p, CTR, data);
for (k = 100; k > 0; k--) { return readl_poll_timeout_atomic(p->mapbase + CTR, data,
if ((sh_msiof_read(p, CTR) & mask) == set) (data & mask) == set, 10, 1000);
break;
udelay(10);
}
return k > 0 ? 0 : -ETIMEDOUT;
} }
static irqreturn_t sh_msiof_spi_irq(int irq, void *data) static irqreturn_t sh_msiof_spi_irq(int irq, void *data)