Message ID | 1366187065-10795-1-git-send-email-rogerq@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, 17 Apr 2013, Roger Quadros wrote: > As the USB PHY layer never returns NULL we don't need > to check for that condition. > > CC: Alan Stern <stern@rowland.harvard.edu> > Signed-off-by: Roger Quadros <rogerq@ti.com> > --- > drivers/usb/host/ehci-omap.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c > index 5de3e43..3d1491b 100644 > --- a/drivers/usb/host/ehci-omap.c > +++ b/drivers/usb/host/ehci-omap.c > @@ -175,12 +175,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) > phy = devm_usb_get_phy_by_phandle(dev, "phys", i); > else > phy = devm_usb_get_phy_dev(dev, i); > - if (IS_ERR(phy) || !phy) { > + if (IS_ERR(phy)) { > /* Don't bail out if PHY is not absolutely necessary */ > if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) > continue; > > - ret = IS_ERR(phy) ? PTR_ERR(phy) : -ENODEV; > + ret = PTR_ERR(phy); > dev_err(dev, "Can't get PHY device for port %d: %d\n", > i, ret); > goto err_phy; Acked-by: Alan Stern <stern@rowland.harvard.edu> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index 5de3e43..3d1491b 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c @@ -175,12 +175,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) phy = devm_usb_get_phy_by_phandle(dev, "phys", i); else phy = devm_usb_get_phy_dev(dev, i); - if (IS_ERR(phy) || !phy) { + if (IS_ERR(phy)) { /* Don't bail out if PHY is not absolutely necessary */ if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) continue; - ret = IS_ERR(phy) ? PTR_ERR(phy) : -ENODEV; + ret = PTR_ERR(phy); dev_err(dev, "Can't get PHY device for port %d: %d\n", i, ret); goto err_phy;
As the USB PHY layer never returns NULL we don't need to check for that condition. CC: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Roger Quadros <rogerq@ti.com> --- drivers/usb/host/ehci-omap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)