diff options
| author | Jules Maselbas <jmaselbas@kalray.eu> | 2021-03-12 17:24:30 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-03-15 09:51:33 +0100 |
| commit | fdd30cc251c87b2932ece10023b4c7287e1e560d (patch) | |
| tree | d5ebca3bb7633b2d3586850cfe14ac6c330a7c20 | |
| parent | e589ab6d8a7ba8caa09115f982066f4efd1fff95 (diff) | |
| download | barebox-fdd30cc251c87b2932ece10023b4c7287e1e560d.tar.gz barebox-fdd30cc251c87b2932ece10023b4c7287e1e560d.tar.xz | |
usb: dwc2: Rework dwc2_wait_for_mode to use wait_on_timeout
Cc: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/usb/dwc2/gadget.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index b8ec37be78..3fc7099d78 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ #include <dma.h> #include <usb/gadget.h> -#include <linux/iopoll.h> #include "dwc2.h" #define to_dwc2 gadget_to_dwc2 @@ -2668,13 +2667,13 @@ static int dwc2_eps_alloc(struct dwc2 *dwc2) */ static void dwc2_wait_for_mode(struct dwc2 *dwc2, bool host_mode) { - int val, ret; + unsigned int timeout = 110 * USECOND; + int ret; dev_vdbg(dwc2->dev, "Waiting for %s mode\n", host_mode ? "host" : "device"); - ret = readx_poll_timeout(dwc2_is_host_mode, dwc2, val, - val == host_mode, 110 * USEC_PER_MSEC); + ret = wait_on_timeout(timeout, dwc2_is_host_mode(dwc2) == host_mode); if (ret) dev_err(dwc2->dev, "%s: Couldn't set %s mode\n", __func__, host_mode ? "host" : "device"); |