usb: Remove dev_err() usage after platform_get_irq()

We don't need dev_err() messages when platform_get_irq() fails now that
platform_get_irq() prints an error message itself when something goes
wrong. Let's remove these prints with a simple semantic patch.

// <smpl>
@@
expression ret;
struct platform_device *E;
@@

ret =
(
platform_get_irq(E, ...)
|
platform_get_irq_byname(E, ...)
);

if ( \( ret < 0 \| ret <= 0 \) )
{
(
-if (ret != -EPROBE_DEFER)
-{ ...
-dev_err(...);
-... }
|
...
-dev_err(...);
)
...
}
// </smpl>

While we're here, remove braces on if statements that only have one
statement (manually).

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20190730181557.90391-47-swboyd@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 26062d610c20d1c800c7dbde6b5b4c29f5efbab4..36c964cd40a35d403afca5238e1771278acfefe1 100644 (file)
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -1008,7 +1008,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 
        ci->irq = platform_get_irq(pdev, 0);
        if (ci->irq < 0) {
-               dev_err(dev, "missing IRQ\n");
                ret = ci->irq;
                goto deinit_phy;
        }

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index 80fd3c6dcd1c34ac6d10da938052bff2ef7c8aac..3c6ce09a6db569103ed830c57c4212f88428c512 100644 (file)
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -407,10 +407,8 @@ static int dwc2_driver_probe(struct platform_device *dev)
        spin_lock_init(&hsotg->lock);
 
        hsotg->irq = platform_get_irq(dev, 0);
-       if (hsotg->irq < 0) {
-               dev_err(&dev->dev, "missing IRQ resource\n");
+       if (hsotg->irq < 0)
                return hsotg->irq;
-       }
 
        dev_dbg(hsotg->dev, "registering common handler for irq%d\n",
                hsotg->irq);

diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c
index cbee5fb9b9fb02d2e40e795d6e4276f0cdeaba6d..a69eb4a7b832fadcc0428184cfcc9469921e54ab 100644 (file)
--- a/drivers/usb/dwc3/dwc3-keystone.c
+++ b/drivers/usb/dwc3/dwc3-keystone.c
@@ -112,7 +112,6 @@ static int kdwc3_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               dev_err(&pdev->dev, "missing irq\n");
                error = irq;
                goto err_irq;
        }

diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index ed8b865176758fdeef0fc4d7c754793aad580ac0..6f711d58d82f30ab314b10f07da470e777c1c462 100644 (file)
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -469,10 +469,8 @@ static int dwc3_omap_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, omap);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "missing IRQ resource: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        base = devm_ioremap_resource(dev, res);

diff --git a/drivers/usb/gadget/udc/aspeed-vhub/core.c b/drivers/usb/gadget/udc/aspeed-vhub/core.c
index db3628be38c07b270eda5b9afe9d3cba1cab47e1..c08d385e27239a231f1a4a988e55a5ed8a1e7320 100644 (file)
--- a/drivers/usb/gadget/udc/aspeed-vhub/core.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/core.c
@@ -348,7 +348,6 @@ static int ast_vhub_probe(struct platform_device *pdev)
        /* Find interrupt and install handler */
        vhub->irq = platform_get_irq(pdev, 0);
        if (vhub->irq < 0) {
-               dev_err(&pdev->dev, "Failed to get interrupt\n");
                rc = vhub->irq;
                goto err;
        }

diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c
index c1fcc77403eaffaba6e2b60089524237d96976f7..97b16463f3ef6013e6199410c64626abe03a07b3 100644 (file)
--- a/drivers/usb/gadget/udc/bcm63xx_udc.c
+++ b/drivers/usb/gadget/udc/bcm63xx_udc.c
@@ -2328,10 +2328,8 @@ static int bcm63xx_udc_probe(struct platform_device *pdev)
 
        /* IRQ resource #0: control interrupt (VBUS, speed, etc.) */
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "missing IRQ resource #0\n");
+       if (irq < 0)
                goto out_uninit;
-       }
        if (devm_request_irq(dev, irq, &bcm63xx_udc_ctrl_isr, 0,
                             dev_name(dev), udc) < 0)
                goto report_request_failure;
@@ -2339,10 +2337,8 @@ static int bcm63xx_udc_probe(struct platform_device *pdev)
        /* IRQ resources #1-6: data interrupts for IUDMA channels 0-5 */
        for (i = 0; i < BCM63XX_NUM_IUDMA; i++) {
                irq = platform_get_irq(pdev, i + 1);
-               if (irq < 0) {
-                       dev_err(dev, "missing IRQ resource #%d\n", i + 1);
+               if (irq < 0)
                        goto out_uninit;
-               }
                if (devm_request_irq(dev, irq, &bcm63xx_udc_data_isr, 0,
                                     dev_name(dev), &udc->iudma[i]) < 0)
                        goto report_request_failure;

diff --git a/drivers/usb/gadget/udc/bdc/bdc_core.c b/drivers/usb/gadget/udc/bdc/bdc_core.c
index ccbd1d34eb2a3ee5cd52548abd6676725b5ff1ac..cc4a16e253ac5c5c1d2b449e0473da6cac647f45 100644 (file)
--- a/drivers/usb/gadget/udc/bdc/bdc_core.c
+++ b/drivers/usb/gadget/udc/bdc/bdc_core.c
@@ -515,10 +515,8 @@ static int bdc_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "platform_get_irq failed:%d\n", irq);
+       if (irq < 0)
                return irq;
-       }
        spin_lock_init(&bdc->lock);
        platform_set_drvdata(pdev, bdc);
        bdc->irq = irq;

diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index 729e60e495641c8a523265f6812c5b34c1f23213..7a0e9a58c2d8403bacdcbad08939b2a4453074a8 100644 (file)
--- a/drivers/usb/gadget/udc/gr_udc.c
+++ b/drivers/usb/gadget/udc/gr_udc.c
@@ -2134,19 +2134,15 @@ static int gr_probe(struct platform_device *pdev)
                return PTR_ERR(regs);
 
        dev->irq = platform_get_irq(pdev, 0);
-       if (dev->irq <= 0) {
-               dev_err(dev->dev, "No irq found\n");
+       if (dev->irq <= 0)
                return -ENODEV;
-       }
 
        /* Some core configurations has separate irqs for IN and OUT events */
        dev->irqi = platform_get_irq(pdev, 1);
        if (dev->irqi > 0) {
                dev->irqo = platform_get_irq(pdev, 2);
-               if (dev->irqo <= 0) {
-                       dev_err(dev->dev, "Found irqi but not irqo\n");
+               if (dev->irqo <= 0)
                        return -ENODEV;
-               }
        } else {
                dev->irqi = 0;
        }

diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c
index 5f1b14f3e5a07ba0282cbf0ec56535e1aef95608..e9cf20979bf6dfe5e97663db6df4ae148bd6a0ad 100644 (file)
--- a/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
@@ -3061,11 +3061,8 @@ static int lpc32xx_udc_probe(struct platform_device *pdev)
        /* Get IRQs */
        for (i = 0; i < 4; i++) {
                udc->udp_irq[i] = platform_get_irq(pdev, i);
-               if (udc->udp_irq[i] < 0) {
-                       dev_err(udc->dev,
-                               "irq resource %d not available!\n", i);
+               if (udc->udp_irq[i] < 0)
                        return udc->udp_irq[i];
-               }
        }
 
        udc->udp_baseaddr = devm_ioremap_resource(dev, res);

diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index 87062d22134da38d22dce196f28461ce22d4a0da..027a25694a681e3dd6f76e239be0faaa7183d5f2 100644 (file)
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -2743,10 +2743,8 @@ static int renesas_usb3_probe(struct platform_device *pdev)
                priv = of_device_get_match_data(&pdev->dev);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        usb3 = devm_kzalloc(&pdev->dev, sizeof(*usb3), GFP_KERNEL);
        if (!usb3)

diff --git a/drivers/usb/gadget/udc/s3c-hsudc.c b/drivers/usb/gadget/udc/s3c-hsudc.c
index 31c7c5587cf932aa283174aeec8c492c5bc17593..858993c73442243c2a005934eb91e21b0dc1ae9e 100644 (file)
--- a/drivers/usb/gadget/udc/s3c-hsudc.c
+++ b/drivers/usb/gadget/udc/s3c-hsudc.c
@@ -1311,10 +1311,8 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
        s3c_hsudc_setup_ep(hsudc);
 
        ret = platform_get_irq(pdev, 0);
-       if (ret < 0) {
-               dev_err(dev, "unable to obtain IRQ number\n");
+       if (ret < 0)
                goto err_res;
-       }
        hsudc->irq = ret;
 
        ret = devm_request_irq(&pdev->dev, hsudc->irq, s3c_hsudc_irq, 0,

diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
index b1f4104d12838e96a0d05c9bab52ce0b437aeef5..29d8e5f8bb58397ec6402f22cf723e5774f6f132 100644 (file)
--- a/drivers/usb/gadget/udc/udc-xilinx.c
+++ b/drivers/usb/gadget/udc/udc-xilinx.c
@@ -2074,10 +2074,8 @@ static int xudc_probe(struct platform_device *pdev)
                return PTR_ERR(udc->addr);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "unable to get irq\n");
+       if (irq < 0)
                return irq;
-       }
        ret = devm_request_irq(&pdev->dev, irq, xudc_irq, 0,
                               dev_name(&pdev->dev), udc);
        if (ret < 0) {

diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3ba140ceaf52cb6ac35ff0c8709f14d4795fdeb4..e893467d659c5f03b9c7aa9ff1a091dd5924b0a6 100644 (file)
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -100,9 +100,6 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
-               dev_err(&pdev->dev,
-                       "Found HC with no IRQ. Check %s setup!\n",
-                       dev_name(&pdev->dev));
                retval = -ENODEV;
                goto fail_create_hcd;
        }

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 7d20296cbe9f9459d31742a29049c4c9c518b27e..fc125b3d06e7da76913b3009e732f0ce81d0bf75 100644 (file)
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -115,10 +115,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "EHCI irq failed: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        res =  platform_get_resource(pdev, IORESOURCE_MEM, 0);
        regs = devm_ioremap_resource(dev, res);

diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 790acf3633e8912382e414c8e5ac343438e5b8f1..a319b1df3011c4e410bc43dc3d8c6d2687082c51 100644 (file)
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -223,9 +223,6 @@ static int ehci_orion_drv_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
-               dev_err(&pdev->dev,
-                       "Found HC with no IRQ. Check %s setup!\n",
-                       dev_name(&pdev->dev));
                err = -ENODEV;
                goto err;
        }

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 4c306fb6b06997367fe7f0e5659faddaf28759fe..769749ca5961a422ac9e69834a20c76533cab90d 100644 (file)
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -145,10 +145,8 @@ static int ehci_platform_probe(struct platform_device *dev)
        }
 
        irq = platform_get_irq(dev, 0);
-       if (irq < 0) {
-               dev_err(&dev->dev, "no irq provided");
+       if (irq < 0)
                return irq;
-       }
 
        hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev,
                             dev_name(&dev->dev));

diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
index a9ee767952c1d635b52a3a6866e8c9f8a2ffed01..ef75b9d70eb4e4bf90a37c83b0458f62e73267e1 100644 (file)
--- a/drivers/usb/host/ehci-sh.c
+++ b/drivers/usb/host/ehci-sh.c
@@ -85,9 +85,6 @@ static int ehci_hcd_sh_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq <= 0) {
-               dev_err(&pdev->dev,
-                       "Found HC with no IRQ. Check %s setup!\n",
-                       dev_name(&pdev->dev));
                ret = -ENODEV;
                goto fail_create_hcd;
        }

diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c
index ccb4e611001da2af0f17d8b6008a70341611ae31..f74433aac94860e70bdf8fb705593f1a6b67dde0 100644 (file)
--- a/drivers/usb/host/ehci-st.c
+++ b/drivers/usb/host/ehci-st.c
@@ -158,10 +158,8 @@ static int st_ehci_platform_probe(struct platform_device *dev)
                return -ENODEV;
 
        irq = platform_get_irq(dev, 0);
-       if (irq < 0) {
-               dev_err(&dev->dev, "no irq provided");
+       if (irq < 0)
                return irq;
-       }
        res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
        if (!res_mem) {
                dev_err(&dev->dev, "no memory resource provided");

diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index 6e3dad19d3696a78054bc809c25ef7c7d6d294a0..e406c5459a973ce29a1e48d3eefcdf8fd09af18d 100644 (file)
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -1836,10 +1836,8 @@ static int imx21_probe(struct platform_device *pdev)
        if (!res)
                return -ENODEV;
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        hcd = usb_create_hcd(&imx21_hc_driver,
                &pdev->dev, dev_name(&pdev->dev));

diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 65a1c3fdc88c68b5f5dd8d1e50ffd22d9ea7983f..7addfc2cbadce08d4d92ed858d4f226b0e3e676f 100644 (file)
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -111,10 +111,8 @@ static int ohci_platform_probe(struct platform_device *dev)
                return err;
 
        irq = platform_get_irq(dev, 0);
-       if (irq < 0) {
-               dev_err(&dev->dev, "no irq provided");
+       if (irq < 0)
                return irq;
-       }
 
        hcd = usb_create_hcd(&ohci_platform_hc_driver, &dev->dev,
                        dev_name(&dev->dev));

diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
index 638a92bd2cdc22726715ad5a97690e8d89180381..ac796ccd93ef45e3a1b233b1cb53c4b49cb0dfa7 100644 (file)
--- a/drivers/usb/host/ohci-st.c
+++ b/drivers/usb/host/ohci-st.c
@@ -138,10 +138,8 @@ static int st_ohci_platform_probe(struct platform_device *dev)
                return -ENODEV;
 
        irq = platform_get_irq(dev, 0);
-       if (irq < 0) {
-               dev_err(&dev->dev, "no irq provided");
+       if (irq < 0)
                return irq;
-       }
 
        res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0);
        if (!res_mem) {

diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
index f8bd1d57e79515b334fd9a84e706fa21178e667d..c3d5c1206eec808bb96d54ef5cc713219c39c93e 100644 (file)
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -835,10 +835,8 @@ int ssusb_gadget_init(struct ssusb_mtk *ssusb)
                return -ENOMEM;
 
        mtu->irq = platform_get_irq(pdev, 0);
-       if (mtu->irq < 0) {
-               dev_err(dev, "fail to get irq number\n");
+       if (mtu->irq < 0)
                return mtu->irq;
-       }
        dev_info(dev, "irq %d\n", mtu->irq);
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac");

diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c
index 14b432982fd3e572dc42da51a3856a4bdf304d9a..4bb4b1d42f32c354315f2aa4d5de9e041dad95e3 100644 (file)
--- a/drivers/usb/phy/phy-ab8500-usb.c
+++ b/drivers/usb/phy/phy-ab8500-usb.c
@@ -718,10 +718,8 @@ static int ab8500_usb_irq_setup(struct platform_device *pdev,
 
        if (ab->flags & AB8500_USB_FLAG_USE_LINK_STATUS_IRQ) {
                irq = platform_get_irq_byname(pdev, "USB_LINK_STATUS");
-               if (irq < 0) {
-                       dev_err(&pdev->dev, "Link status irq not found\n");
+               if (irq < 0)
                        return irq;
-               }
                err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                ab8500_usb_link_status_irq,
                                IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,
@@ -734,10 +732,8 @@ static int ab8500_usb_irq_setup(struct platform_device *pdev,
 
        if (ab->flags & AB8500_USB_FLAG_USE_ID_WAKEUP_IRQ) {
                irq = platform_get_irq_byname(pdev, "ID_WAKEUP_F");
-               if (irq < 0) {
-                       dev_err(&pdev->dev, "ID fall irq not found\n");
+               if (irq < 0)
                        return irq;
-               }
                err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                ab8500_usb_disconnect_irq,
                                IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,
@@ -750,10 +746,8 @@ static int ab8500_usb_irq_setup(struct platform_device *pdev,
 
        if (ab->flags & AB8500_USB_FLAG_USE_VBUS_DET_IRQ) {
                irq = platform_get_irq_byname(pdev, "VBUS_DET_F");
-               if (irq < 0) {
-                       dev_err(&pdev->dev, "VBUS fall irq not found\n");
+               if (irq < 0)
                        return irq;
-               }
                err = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                                ab8500_usb_disconnect_irq,
                                IRQF_NO_SUSPEND | IRQF_SHARED | IRQF_ONESHOT,

diff --git a/drivers/usb/typec/tcpm/wcove.c b/drivers/usb/typec/tcpm/wcove.c
index 6b317c150bdd07591c882f035185a53db9002b69..edc271da14f4033fb0f3d991cb85099160e94b99 100644 (file)
--- a/drivers/usb/typec/tcpm/wcove.c
+++ b/drivers/usb/typec/tcpm/wcove.c
@@ -617,10 +617,8 @@ static int wcove_typec_probe(struct platform_device *pdev)
        wcove->regmap = pmic->regmap;
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        irq = regmap_irq_get_virq(pmic->irq_chip_data_chgr, irq);
        if (irq < 0)