usb: musb: Use read_poll_timeout()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 10 Jul 2023 09:46:45 +0000 (12:46 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 25 Jul 2023 16:18:18 +0000 (18:18 +0200)
Use read_poll_timeout() instead of open coding it.
In the same time, fix the typo in the error message.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230710094645.42111-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/musb/tusb6010.c

index cbc707f..4615876 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/usb.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/iopoll.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
@@ -1029,7 +1030,7 @@ static int tusb_musb_start(struct musb *musb)
        void __iomem    *tbase = musb->ctrl_base;
        unsigned long   flags;
        u32             reg;
-       int             i;
+       int             ret;
 
        /*
         * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
@@ -1037,17 +1038,13 @@ static int tusb_musb_start(struct musb *musb)
         * provide then PGOOD signal to TUSB6010 which will release it from reset.
         */
        gpiod_set_value(glue->enable, 1);
-       msleep(1);
 
        /* Wait for 100ms until TUSB6010 pulls INT pin down */
-       i = 100;
-       while (i && gpiod_get_value(glue->intpin)) {
-               msleep(1);
-               i--;
-       }
-       if (!i) {
-               pr_err("tusb: Powerup respones failed\n");
-               return -ENODEV;
+       ret = read_poll_timeout(gpiod_get_value, reg, !reg, 5000, 100000, true,
+                               glue->intpin);
+       if (ret) {
+               pr_err("tusb: Powerup response failed\n");
+               return ret;
        }
 
        spin_lock_irqsave(&musb->lock, flags);