usb: phy: fix return value check of usb_get_phy

usb_get_phy will return -ENODEV if it's not able to find the phy. Hence
fixed all the callers of usb_get_phy to check for this error condition
instead of relying on a non-zero value as success condition.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

6 files changed, 45 insertions, 39 deletions

diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 0808820ba495..8d8fca635cc7 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -24,6 +24,7 @@
 #include <linux/ioport.h>
 #include <linux/types.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/list.h>
@@ -1229,7 +1230,7 @@ static int fsl_vbus_draw(struct usb_gadget *gadget, unsigned mA)
         struct fsl_udc *udc;
 
         udc = container_of(gadget, struct fsl_udc, gadget);
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 return usb_phy_set_power(udc->transceiver, mA);
         return -ENOTSUPP;
 }
@@ -1983,13 +1984,13 @@ static int fsl_start(struct usb_gadget_driver *driver,
                 goto out;
         }
 
-        if (udc_controller->transceiver) {
+        if (!IS_ERR_OR_NULL(udc_controller->transceiver)) {
                 /* Suspend the controller until OTG enable it */
                 udc_controller->stopped = 1;
                 printk(KERN_INFO "Suspend udc for OTG auto detect\n");
 
                 /* connect to bus through transceiver */
-                if (udc_controller->transceiver) {
+                if (!IS_ERR_OR_NULL(udc_controller->transceiver)) {
                         retval = otg_set_peripheral(
                                         udc_controller->transceiver->otg,
                                                     &udc_controller->gadget);
@@ -2030,7 +2031,7 @@ static int fsl_stop(struct usb_gadget_driver *driver)
         if (!driver || driver != udc_controller->driver || !driver->unbind)
                 return -EINVAL;
 
-        if (udc_controller->transceiver)
+        if (!IS_ERR_OR_NULL(udc_controller->transceiver))
                 otg_set_peripheral(udc_controller->transceiver->otg, NULL);
 
         /* stop DR, disable intr */
@@ -2456,7 +2457,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
 #ifdef CONFIG_USB_OTG
         if (pdata->operating_mode == FSL_USB2_DR_OTG) {
                 udc_controller->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
-                if (!udc_controller->transceiver) {
+                if (IS_ERR_OR_NULL(udc_controller->transceiver)) {
                         ERR("Can't find OTG driver!\n");
                         ret = -ENODEV;
                         goto err_kfree;
@@ -2540,7 +2541,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
                 goto err_free_irq;
         }
 
-        if (!udc_controller->transceiver) {
+        if (IS_ERR_OR_NULL(udc_controller->transceiver)) {
                 /* initialize usb hw reg except for regs for EP,
                  * leave usbintr reg untouched */
                 dr_controller_setup(udc_controller);
@@ -2564,7 +2565,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
         if (ret < 0)
                 goto err_free_irq;
 
-        if (udc_controller->transceiver)
+        if (!IS_ERR_OR_NULL(udc_controller->transceiver))
                 udc_controller->gadget.is_otg = 1;
 
         /* setup QH and epctrl for ep0 */
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index 75ff41a5c959..9305de41af28 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/timer.h>
 #include <linux/list.h>
@@ -1381,7 +1382,7 @@ static int mv_udc_start(struct usb_gadget_driver *driver,
                 return retval;
         }
 
-        if (udc->transceiver) {
+        if (!IS_ERR_OR_NULL(udc->transceiver)) {
                 retval = otg_set_peripheral(udc->transceiver->otg,
                                         &udc->gadget);
                 if (retval) {
@@ -2107,7 +2108,7 @@ static int __devexit mv_udc_remove(struct platform_device *dev)
          * then vbus irq will not be requested in udc driver.
          */
         if (udc->pdata && udc->pdata->vbus
-                && udc->clock_gating && udc->transceiver == NULL)
+                && udc->clock_gating && IS_ERR_OR_NULL(udc->transceiver))
                 free_irq(udc->pdata->vbus->irq, &dev->dev);
 
         /* free memory allocated in probe */
@@ -2325,7 +2326,7 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
         eps_init(udc);
 
         /* VBUS detect: we can disable/enable clock on demand.*/
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 udc->clock_gating = 1;
         else if (pdata->vbus) {
                 udc->clock_gating = 1;
@@ -2369,7 +2370,7 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
 
 err_unregister:
         if (udc->pdata && udc->pdata->vbus
-                && udc->clock_gating && udc->transceiver == NULL)
+                && udc->clock_gating && IS_ERR_OR_NULL(udc->transceiver))
                 free_irq(pdata->vbus->irq, &dev->dev);
         device_unregister(&udc->gadget.dev);
 err_free_irq:
@@ -2404,7 +2405,7 @@ static int mv_udc_suspend(struct device *_dev)
         struct mv_udc *udc = the_controller;
 
         /* if OTG is enabled, the following will be done in OTG driver*/
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 return 0;
 
         if (udc->pdata->vbus && udc->pdata->vbus->poll)
@@ -2437,7 +2438,7 @@ static int mv_udc_resume(struct device *_dev)
         int retval;
 
         /* if OTG is enabled, the following will be done in OTG driver*/
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 return 0;
 
         if (!udc->clock_gating) {
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index cf8bf26f12ed..7b71295adf6f 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -35,6 +35,7 @@
 #include <linux/usb/otg.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/prefetch.h>
 
 #include <asm/byteorder.h>
@@ -1211,7 +1212,7 @@ static int omap_wakeup(struct usb_gadget *gadget)
 
         /* NOTE:  non-OTG systems may use SRP TOO... */
         } else if (!(udc->devstat & UDC_ATT)) {
-                if (udc->transceiver)
+                if (!IS_ERR_OR_NULL(udc->transceiver))
                         retval = otg_start_srp(udc->transceiver->otg);
         }
         spin_unlock_irqrestore(&udc->lock, flags);
@@ -1343,7 +1344,7 @@ static int omap_vbus_draw(struct usb_gadget *gadget, unsigned mA)
         struct omap_udc *udc;
 
         udc = container_of(gadget, struct omap_udc, gadget);
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 return usb_phy_set_power(udc->transceiver, mA);
         return -EOPNOTSUPP;
 }
@@ -1792,12 +1793,12 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                         if (devstat & UDC_ATT) {
                                 udc->gadget.speed = USB_SPEED_FULL;
                                 VDBG("connect\n");
-                                if (!udc->transceiver)
+                                if (IS_ERR_OR_NULL(udc->transceiver))
                                         pullup_enable(udc);
                                 // if (driver->connect) call it
                         } else if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
                                 udc->gadget.speed = USB_SPEED_UNKNOWN;
-                                if (!udc->transceiver)
+                                if (IS_ERR_OR_NULL(udc->transceiver))
                                         pullup_disable(udc);
                                 DBG("disconnect, gadget %s\n",
                                         udc->driver->driver.name);
@@ -1837,12 +1838,12 @@ static void devstate_irq(struct omap_udc *udc, u16 irq_src)
                                         udc->driver->suspend(&udc->gadget);
                                         spin_lock(&udc->lock);
                                 }
-                                if (udc->transceiver)
+                                if (!IS_ERR_OR_NULL(udc->transceiver))
                                         usb_phy_set_suspend(
                                                         udc->transceiver, 1);
                         } else {
                                 VDBG("resume\n");
-                                if (udc->transceiver)
+                                if (!IS_ERR_OR_NULL(udc->transceiver))
                                         usb_phy_set_suspend(
                                                         udc->transceiver, 0);
                                 if (udc->gadget.speed == USB_SPEED_FULL
@@ -2154,7 +2155,7 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
         omap_writew(UDC_IRQ_SRC_MASK, UDC_IRQ_SRC);
 
         /* connect to bus through transceiver */
-        if (udc->transceiver) {
+        if (!IS_ERR_OR_NULL(udc->transceiver)) {
                 status = otg_set_peripheral(udc->transceiver->otg,
                                                 &udc->gadget);
                 if (status < 0) {
@@ -2201,7 +2202,7 @@ static int omap_udc_stop(struct usb_gadget_driver *driver)
         if (machine_without_vbus_sense())
                 omap_vbus_session(&udc->gadget, 0);
 
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 (void) otg_set_peripheral(udc->transceiver->otg, NULL);
         else
                 pullup_disable(udc);
@@ -2866,7 +2867,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
                  * but not having one probably means no VBUS detection.
                  */
                 xceiv = usb_get_phy(USB_PHY_TYPE_USB2);
-                if (xceiv)
+                if (!IS_ERR_OR_NULL(xceiv))
                         type = xceiv->label;
                 else if (config->otg) {
                         DBG("OTG requires external transceiver!\n");
@@ -2898,7 +2899,7 @@ static int __init omap_udc_probe(struct platform_device *pdev)
                 case 16:
                 case 19:
                 case 25:
-                        if (!xceiv) {
+                        if (IS_ERR_OR_NULL(xceiv)) {
                                 DBG("external transceiver not registered!\n");
                                 type = "unknown";
                         }
@@ -3010,7 +3011,7 @@ cleanup1:
         udc = NULL;
 
 cleanup0:
-        if (xceiv)
+        if (!IS_ERR_OR_NULL(xceiv))
                 usb_put_phy(xceiv);
 
         if (cpu_is_omap16xx() || cpu_is_omap24xx() || cpu_is_omap7xx()) {
@@ -3040,7 +3041,7 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
         udc->done = &done;
 
         pullup_disable(udc);
-        if (udc->transceiver) {
+        if (!IS_ERR_OR_NULL(udc->transceiver)) {
                 usb_put_phy(udc->transceiver);
                 udc->transceiver = NULL;
         }
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index cc0b1e63dcab..fa8e93c2465f 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -21,6 +21,7 @@
 #include <linux/ioport.h>
 #include <linux/types.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/init.h>
@@ -993,7 +994,7 @@ static int pxa25x_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
 
         udc = container_of(_gadget, struct pxa25x_udc, gadget);
 
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 return usb_phy_set_power(udc->transceiver, mA);
         return -EOPNOTSUPP;
 }
@@ -1299,7 +1300,7 @@ fail:
         DMSG("registered gadget driver '%s'\n", driver->driver.name);
 
         /* connect to bus through transceiver */
-        if (dev->transceiver) {
+        if (!IS_ERR_OR_NULL(dev->transceiver)) {
                 retval = otg_set_peripheral(dev->transceiver->otg,
                                                 &dev->gadget);
                 if (retval) {
@@ -1359,7 +1360,7 @@ static int pxa25x_stop(struct usb_gadget_driver *driver)
         stop_activity(dev, driver);
         local_irq_enable();
 
-        if (dev->transceiver)
+        if (!IS_ERR_OR_NULL(dev->transceiver))
                 (void) otg_set_peripheral(dev->transceiver->otg, NULL);
 
         driver->unbind(&dev->gadget);
@@ -2237,7 +2238,7 @@ lubbock_fail0:
         if (gpio_is_valid(dev->mach->gpio_pullup))
                 gpio_free(dev->mach->gpio_pullup);
  err_gpio_pullup:
-        if (dev->transceiver) {
+        if (!IS_ERR_OR_NULL(dev->transceiver)) {
                 usb_put_phy(dev->transceiver);
                 dev->transceiver = NULL;
         }
@@ -2279,7 +2280,7 @@ static int __exit pxa25x_udc_remove(struct platform_device *pdev)
 
         clk_put(dev->clk);
 
-        if (dev->transceiver) {
+        if (!IS_ERR_OR_NULL(dev->transceiver)) {
                 usb_put_phy(dev->transceiver);
                 dev->transceiver = NULL;
         }
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 8f744aab9628..644b4305cb99 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/list.h>
@@ -1573,7 +1574,7 @@ static int should_enable_udc(struct pxa_udc *udc)
         int put_on;
 
         put_on = ((udc->pullup_on) && (udc->driver));
-        put_on &= ((udc->vbus_sensed) || (!udc->transceiver));
+        put_on &= ((udc->vbus_sensed) || (IS_ERR_OR_NULL(udc->transceiver)));
         return put_on;
 }
 
@@ -1594,7 +1595,7 @@ static int should_disable_udc(struct pxa_udc *udc)
         int put_off;
 
         put_off = ((!udc->pullup_on) || (!udc->driver));
-        put_off |= ((!udc->vbus_sensed) && (udc->transceiver));
+        put_off |= ((!udc->vbus_sensed) && (!IS_ERR_OR_NULL(udc->transceiver)));
         return put_off;
 }
 
@@ -1665,7 +1666,7 @@ static int pxa_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA)
         struct pxa_udc *udc;
 
         udc = to_gadget_udc(_gadget);
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 return usb_phy_set_power(udc->transceiver, mA);
         return -EOPNOTSUPP;
 }
@@ -1834,7 +1835,7 @@ static int pxa27x_udc_start(struct usb_gadget_driver *driver,
         dev_dbg(udc->dev, "registered gadget driver '%s'\n",
                 driver->driver.name);
 
-        if (udc->transceiver) {
+        if (!IS_ERR_OR_NULL(udc->transceiver)) {
                 retval = otg_set_peripheral(udc->transceiver->otg,
                                                 &udc->gadget);
                 if (retval) {
@@ -1908,7 +1909,7 @@ static int pxa27x_udc_stop(struct usb_gadget_driver *driver)
         dev_info(udc->dev, "unregistered gadget driver '%s'\n",
                  driver->driver.name);
 
-        if (udc->transceiver)
+        if (!IS_ERR_OR_NULL(udc->transceiver))
                 return otg_set_peripheral(udc->transceiver->otg, NULL);
         return 0;
 }
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 22326f274466..7c915625f240 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
@@ -1165,7 +1166,7 @@ static int s3c_hsudc_start(struct usb_gadget *gadget,
         }
 
         /* connect to bus through transceiver */
-        if (hsudc->transceiver) {
+        if (!IS_ERR_OR_NULL(hsudc->transceiver)) {
                 ret = otg_set_peripheral(hsudc->transceiver->otg,
                                         &hsudc->gadget);
                 if (ret) {
@@ -1220,7 +1221,7 @@ static int s3c_hsudc_stop(struct usb_gadget *gadget,
         s3c_hsudc_stop_activity(hsudc);
         spin_unlock_irqrestore(&hsudc->lock, flags);
 
-        if (hsudc->transceiver)
+        if (!IS_ERR_OR_NULL(hsudc->transceiver))
                 (void) otg_set_peripheral(hsudc->transceiver->otg, NULL);
 
         disable_irq(hsudc->irq);
@@ -1249,7 +1250,7 @@ static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
         if (!hsudc)
                 return -ENODEV;
 
-        if (hsudc->transceiver)
+        if (!IS_ERR_OR_NULL(hsudc->transceiver))
                 return usb_phy_set_power(hsudc->transceiver, mA);
 
         return -EOPNOTSUPP;
@@ -1385,7 +1386,7 @@ err_irq:
 err_remap:
         release_mem_region(res->start, resource_size(res));
 err_res:
-        if (hsudc->transceiver)
+        if (!IS_ERR_OR_NULL(hsudc->transceiver))
                 usb_put_phy(hsudc->transceiver);
 
         regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);