Commit 805ca9c2 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman

usb: udc: net2280: convert to readl_poll_timeout_atomic()

Use readl_poll_timeout_atomic() to simplify code

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Felipe Balbi <balbi@kernel.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1600668815-12135-10-git-send-email-chunfeng.yun@mediatek.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f158afec
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <linux/usb/gadget.h> #include <linux/usb/gadget.h>
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/irq.h> #include <asm/irq.h>
...@@ -360,18 +361,16 @@ net2280_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) ...@@ -360,18 +361,16 @@ net2280_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc)
static int handshake(u32 __iomem *ptr, u32 mask, u32 done, int usec) static int handshake(u32 __iomem *ptr, 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) /* "device unplugged" */ result == U32_MAX),
1, usec);
if (result == U32_MAX) /* device unplugged */
return -ENODEV; return -ENODEV;
result &= mask;
if (result == done) return ret;
return 0;
udelay(1);
usec--;
} while (usec > 0);
return -ETIMEDOUT;
} }
static const struct usb_ep_ops net2280_ep_ops; static const struct usb_ep_ops net2280_ep_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment