mtd: 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).

Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Vignesh Raghavendra <vigneshr@ti.com>
Cc: linux-mtd@lists.infradead.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 986f81d2f93e3d8cdceed38250dbdc8d48046663..7f6f6f1d965fbfdb9686ee21c8dae758be55b148 100644 (file)
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -933,7 +933,6 @@ static int spear_smi_probe(struct platform_device *pdev)
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
                ret = -ENODEV;
-               dev_err(&pdev->dev, "invalid smi irq\n");
                goto err;
        }
 

diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c
index 5e14836f6bd5af7646b8916a0035365692704a8d..df992554a66f08705a61aa838e5c94826b63b007 100644 (file)
--- a/drivers/mtd/nand/raw/denali_dt.c
+++ b/drivers/mtd/nand/raw/denali_dt.c
@@ -167,10 +167,8 @@ static int denali_dt_probe(struct platform_device *pdev)
 
        denali->dev = dev;
        denali->irq = platform_get_irq(pdev, 0);
-       if (denali->irq < 0) {
-               dev_err(dev, "no irq defined\n");
+       if (denali->irq < 0)
                return denali->irq;
-       }
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "denali_reg");
        denali->reg = devm_ioremap_resource(dev, res);

diff --git a/drivers/mtd/nand/raw/hisi504_nand.c b/drivers/mtd/nand/raw/hisi504_nand.c
index 6a4626a8bf95b82d7d587eb1932ce7edb2d03680..0b48be54ba6f211e81cf1696613ee96f9e5bb83c 100644 (file)
--- a/drivers/mtd/nand/raw/hisi504_nand.c
+++ b/drivers/mtd/nand/raw/hisi504_nand.c
@@ -751,10 +751,8 @@ static int hisi_nfc_probe(struct platform_device *pdev)
        mtd  = nand_to_mtd(chip);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "no IRQ resource defined\n");
+       if (irq < 0)
                return -ENXIO;
-       }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        host->iobase = devm_ioremap_resource(dev, res);

diff --git a/drivers/mtd/nand/raw/lpc32xx_mlc.c b/drivers/mtd/nand/raw/lpc32xx_mlc.c
index 78b31f845c50a8e3d4ccffb67f2eb6c7ec38c300..241b58b83240d011d3434e1a0786b03a6fcf22a8 100644 (file)
--- a/drivers/mtd/nand/raw/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_mlc.c
@@ -773,7 +773,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
 
        host->irq = platform_get_irq(pdev, 0);
        if (host->irq < 0) {
-               dev_err(&pdev->dev, "failed to get platform irq\n");
                res = -EINVAL;
                goto release_dma_chan;
        }

diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index fc49e13d81ecc645a4e9c95764846cfa32e8bdd8..fb5abdcfb0073715a287d4963b1c41f578652575 100644 (file)
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -2862,10 +2862,8 @@ static int marvell_nfc_probe(struct platform_device *pdev)
                return PTR_ERR(nfc->regs);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "failed to retrieve irq\n");
+       if (irq < 0)
                return irq;
-       }
 
        nfc->core_clk = devm_clk_get(&pdev->dev, "core");
 

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 1b82b687e5a5037a6f3c7eebf9c997198966afa3..9f17b5b8efbf96e1de1ad631e90505cadafd612e 100644 (file)
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -1399,10 +1399,8 @@ static int meson_nfc_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "no NFC IRQ resource\n");
+       if (irq < 0)
                return -EINVAL;
-       }
 
        ret = meson_nfc_clk_init(nfc);
        if (ret) {

diff --git a/drivers/mtd/nand/raw/mtk_ecc.c b/drivers/mtd/nand/raw/mtk_ecc.c
index 74595b644b7cd7beb619b27e0efe7521ab9761b6..75f1fa3d4d35ca249b97684a31b1fab5e9bf78c6 100644 (file)
--- a/drivers/mtd/nand/raw/mtk_ecc.c
+++ b/drivers/mtd/nand/raw/mtk_ecc.c
@@ -527,10 +527,8 @@ static int mtk_ecc_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "failed to get irq: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        ret = dma_set_mask(dev, DMA_BIT_MASK(32));
        if (ret) {

diff --git a/drivers/mtd/nand/raw/mtk_nand.c b/drivers/mtd/nand/raw/mtk_nand.c
index 373d47d1ba4cbae96cf4edc7556f6811d505de80..b8305e39ab512592d81f5c58f47ac14c57508092 100644 (file)
--- a/drivers/mtd/nand/raw/mtk_nand.c
+++ b/drivers/mtd/nand/raw/mtk_nand.c
@@ -1540,7 +1540,6 @@ static int mtk_nfc_probe(struct platform_device *pdev)
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0) {
-               dev_err(dev, "no nfi irq resource\n");
                ret = -EINVAL;
                goto clk_disable;
        }

diff --git a/drivers/mtd/nand/raw/omap2.c b/drivers/mtd/nand/raw/omap2.c
index 6ec65f48501c032bbcc5eae8c063d28f63c60a56..ad77c112a78a51cf761bee00c0fdcf717b5815a4 100644 (file)
--- a/drivers/mtd/nand/raw/omap2.c
+++ b/drivers/mtd/nand/raw/omap2.c
@@ -1967,10 +1967,8 @@ static int omap_nand_attach_chip(struct nand_chip *chip)
 
        case NAND_OMAP_PREFETCH_IRQ:
                info->gpmc_irq_fifo = platform_get_irq(info->pdev, 0);
-               if (info->gpmc_irq_fifo <= 0) {
-                       dev_err(dev, "Error getting fifo IRQ\n");
+               if (info->gpmc_irq_fifo <= 0)
                        return -ENODEV;
-               }
                err = devm_request_irq(dev, info->gpmc_irq_fifo,
                                       omap_nand_irq, IRQF_SHARED,
                                       "gpmc-nand-fifo", info);
@@ -1982,10 +1980,8 @@ static int omap_nand_attach_chip(struct nand_chip *chip)
                }
 
                info->gpmc_irq_count = platform_get_irq(info->pdev, 1);
-               if (info->gpmc_irq_count <= 0) {
-                       dev_err(dev, "Error getting IRQ count\n");
+               if (info->gpmc_irq_count <= 0)
                        return -ENODEV;
-               }
                err = devm_request_irq(dev, info->gpmc_irq_count,
                                       omap_nand_irq, IRQF_SHARED,
                                       "gpmc-nand-count", info);

diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c
index e509c93737c4f76f5eb50c863393510091d1fa0c..058e99d0cbcf024624390e0e5ce463d9cd8a9b91 100644 (file)
--- a/drivers/mtd/nand/raw/sh_flctl.c
+++ b/drivers/mtd/nand/raw/sh_flctl.c
@@ -1129,10 +1129,8 @@ static int flctl_probe(struct platform_device *pdev)
        flctl->fifo = res->start + 0x24; /* FLDTFIFO */
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "failed to get flste irq data: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(&pdev->dev, irq, flctl_handle_flste, IRQF_SHARED,
                               "flste", flctl);

diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
index 8cc852dc7d548ffa3c0a3bcacc776112f06d14dd..9e63800f768a8f68613efcbdba70ee58bfcff920 100644 (file)
--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -1880,11 +1880,8 @@ static int stm32_fmc2_probe(struct platform_device *pdev)
        }
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               if (irq != -EPROBE_DEFER)
-                       dev_err(dev, "IRQ error missing or invalid\n");
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(dev, irq, stm32_fmc2_irq, 0,
                               dev_name(dev), fmc2);

diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c
index 89773293c64d0b3664d4ad8483d045e5e67fe438..37a4ac0dd85b1435930779ecaa04e4c0a0f3217c 100644 (file)
--- a/drivers/mtd/nand/raw/sunxi_nand.c
+++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -2071,10 +2071,8 @@ static int sunxi_nfc_probe(struct platform_device *pdev)
                return PTR_ERR(nfc->regs);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "failed to retrieve irq\n");
+       if (irq < 0)
                return irq;
-       }
 
        nfc->ahb_clk = devm_clk_get(dev, "ahb");
        if (IS_ERR(nfc->ahb_clk)) {

diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index 7bef63947b29fb8b6e6a9ae10163c7aa63159ea7..37be80bd511eded0186c030411d5df4b79ca6f78 100644 (file)
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -1366,10 +1366,8 @@ static int cqspi_probe(struct platform_device *pdev)
 
        /* Obtain IRQ line. */
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "Cannot obtain IRQ.\n");
+       if (irq < 0)
                return -ENXIO;
-       }
 
        pm_runtime_enable(dev);
        ret = pm_runtime_get_sync(dev);