From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 06/10] usb: fotg210-hcd: convert to readl_poll_timeout_atomic()
Date: Wed, 19 Aug 2020 20:41:01 +0800 [thread overview]
Message-ID: <1597840865-26631-6-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1597840865-26631-1-git-send-email-chunfeng.yun@mediatek.com>
Use readl_poll_timeout_atomic() to simplify code
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
drivers/usb/host/fotg210-hcd.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index 194df82..1d94fcf 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -32,6 +32,7 @@
#include <linux/uaccess.h>
#include <linux/platform_device.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/clk.h>
#include <asm/byteorder.h>
@@ -883,18 +884,15 @@ static int handshake(struct fotg210_hcd *fotg210, void __iomem *ptr,
u32 mask, u32 done, int usec)
{
u32 result;
+ int ret;
- do {
- result = fotg210_readl(fotg210, ptr);
- if (result == ~(u32)0) /* card removed */
- return -ENODEV;
- result &= mask;
- if (result == done)
- return 0;
- udelay(1);
- usec--;
- } while (usec > 0);
- return -ETIMEDOUT;
+ ret = readl_poll_timeout_atomic(ptr, result,
+ ((result & mask) == done ||
+ result == U32_MAX), 1, usec);
+ if (result == U32_MAX) /* card removed */
+ return -ENODEV;
+
+ return ret;
}
/* Force HC to halt state from unknown (EHCI spec section 2.3).
--
1.9.1
next prev parent reply other threads:[~2020-08-19 12:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-19 12:40 [PATCH 01/10] usb: early: convert to readl_poll_timeout_atomic() Chunfeng Yun
2020-08-19 12:40 ` [PATCH 02/10] usb: early: ehci-dbgp: " Chunfeng Yun
2020-08-19 12:40 ` [PATCH 03/10] usb: pci-quirks: " Chunfeng Yun
2020-08-19 12:40 ` [PATCH 04/10] usb: xhci-rcar: " Chunfeng Yun
2020-08-19 12:41 ` [PATCH 05/10] usb: oxu210hp-hcd: " Chunfeng Yun
2020-08-19 12:41 ` Chunfeng Yun [this message]
2020-08-19 12:41 ` [PATCH 07/10] usb: isp1760-hcd: " Chunfeng Yun
2020-08-19 12:41 ` [PATCH 08/10] usb: phy-ulpi-viewport: " Chunfeng Yun
2020-08-19 12:41 ` [PATCH 09/10] usb: phy: phy-mv-usb: " Chunfeng Yun
2020-08-19 12:41 ` [PATCH 10/10] usb: udc: net2280: " Chunfeng Yun
2020-08-19 14:59 ` Alan Stern
2020-08-20 1:57 ` Chunfeng Yun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1597840865-26631-6-git-send-email-chunfeng.yun@mediatek.com \
--to=chunfeng.yun@mediatek.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).