diff options
| author | Chunfeng Yun <chunfeng.yun@mediatek.com> | 2020-09-21 14:13:31 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-25 16:30:05 +0200 |
| commit | 08305b45a404e8f0da7a9e6bf410e391fb4bb185 (patch) | |
| tree | 92fc60b4e901152ac3219b0585e56f4db58bd310 /drivers/usb/isp1760 | |
| parent | e7d8263bdd5c6a4f5de3652b4d96c1af24963be4 (diff) | |
| download | linux-stable-08305b45a404e8f0da7a9e6bf410e391fb4bb185.tar.gz linux-stable-08305b45a404e8f0da7a9e6bf410e391fb4bb185.tar.bz2 linux-stable-08305b45a404e8f0da7a9e6bf410e391fb4bb185.zip | |
usb: isp1760-hcd: convert to readl_poll_timeout_atomic()
Use readl_poll_timeout_atomic() to simplify code
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1600668815-12135-7-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/isp1760')
| -rw-r--r-- | drivers/usb/isp1760/isp1760-hcd.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c index dd74ab7a2f9c..33ae656c4b68 100644 --- a/drivers/usb/isp1760/isp1760-hcd.c +++ b/drivers/usb/isp1760/isp1760-hcd.c @@ -22,6 +22,7 @@ #include <linux/debugfs.h> #include <linux/uaccess.h> #include <linux/io.h> +#include <linux/iopoll.h> #include <linux/mm.h> #include <linux/timer.h> #include <asm/unaligned.h> @@ -380,18 +381,15 @@ static int handshake(struct usb_hcd *hcd, u32 reg, u32 mask, u32 done, int usec) { u32 result; + int ret; + + ret = readl_poll_timeout_atomic(hcd->regs + reg, result, + ((result & mask) == done || + result == U32_MAX), 1, usec); + if (result == U32_MAX) + return -ENODEV; - do { - result = reg_read32(hcd->regs, reg); - if (result == ~0) - return -ENODEV; - result &= mask; - if (result == done) - return 0; - udelay(1); - usec--; - } while (usec > 0); - return -ETIMEDOUT; + return ret; } /* reset a non-running (STS_HALT == 1) controller */ |