openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: oxu210hp-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-5-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chunfeng Yun 2020-09-21 14:13:29 +08:00 committed by Greg Kroah-Hartman
parent 8469ab98a7
commit d43a69018e
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/usb/host/oxu210hp-hcd.c
View File

@ -24,6 +24,7 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/unaligned.h> #include <asm/unaligned.h>
@ -748,18 +749,16 @@ static int handshake(struct oxu_hcd *oxu, void __iomem *ptr,
u32 mask, u32 done, int usec) u32 mask, u32 done, int usec)
{ {
u32 result; u32 result;
int ret;
do { ret = readl_poll_timeout_atomic(ptr, result,
result = readl(ptr); ((result & mask) == done ||
if (result == ~(u32)0) /* card removed */ result == U32_MAX),
return -ENODEV; 1, usec);
result &= mask; if (result == U32_MAX) /* card removed */
if (result == done) return -ENODEV;
return 0;
udelay(1); return ret;
usec--;
} while (usec > 0);
return -ETIMEDOUT;
} }
/* Force HC to halt state from unknown (EHCI spec section 2.3) */ /* Force HC to halt state from unknown (EHCI spec section 2.3) */