i2c: busses: remove duplicate dev_err()

it will print an error message by itself when platform_get_irq()
goes wrong. so don't need dev_err() in here again.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Suggested-by: Markus Elfring <Markus.Elfring@web.de>
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-altera.c b/drivers/i2c/busses/i2c-altera.c
index 083699d74f9aca9939355297953232813020625f..027faabe3d043062ab82636065b0dd6c8912072a 100644 (file)
--- a/drivers/i2c/busses/i2c-altera.c
+++ b/drivers/i2c/busses/i2c-altera.c
@@ -394,10 +394,8 @@ static int altr_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(idev->base);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "missing interrupt resource\n");
+       if (irq < 0)
                return irq;
-       }
 
        idev->i2c_clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(idev->i2c_clk)) {

diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c
index d45e2290c3f7242670427cb91dd2e25163cf57fa..5294b73beca85464f3c9444e6c564eb56c60d2dd 100644 (file)
--- a/drivers/i2c/busses/i2c-axxia.c
+++ b/drivers/i2c/busses/i2c-axxia.c
@@ -746,10 +746,8 @@ static int axxia_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(base);
 
        idev->irq = platform_get_irq(pdev, 0);
-       if (idev->irq < 0) {
-               dev_err(&pdev->dev, "missing interrupt resource\n");
+       if (idev->irq < 0)
                return idev->irq;
-       }
 
        idev->i2c_clk = devm_clk_get(&pdev->dev, "i2c");
        if (IS_ERR(idev->i2c_clk)) {

diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c
index 3e63f706f66b2841aa638852f14e3656418e234e..ed5e1275ae46f956fbb103e3091ee145cb9809b1 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm-kona.c
+++ b/drivers/i2c/busses/i2c-bcm-kona.c
@@ -821,8 +821,7 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev)
        /* Get the interrupt number */
        dev->irq = platform_get_irq(pdev, 0);
        if (dev->irq < 0) {
-               dev_err(dev->device, "no irq resource\n");
-               rc = -ENODEV;
+               rc = dev->irq;
                goto probe_disable_clk;
        }
 

diff --git a/drivers/i2c/busses/i2c-cht-wc.c b/drivers/i2c/busses/i2c-cht-wc.c
index 35e55feda763ec480e9f4af89b15a0188603bd22..f80d79e973cd25178cb1094c8148407b6bfebc7e 100644 (file)
--- a/drivers/i2c/busses/i2c-cht-wc.c
+++ b/drivers/i2c/busses/i2c-cht-wc.c
@@ -314,10 +314,8 @@ static int cht_wc_i2c_adap_i2c_probe(struct platform_device *pdev)
        int ret, reg, irq;
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "Error missing irq resource\n");
-               return -EINVAL;
-       }
+       if (irq < 0)
+               return irq;
 
        adap = devm_kzalloc(&pdev->dev, sizeof(*adap), GFP_KERNEL);
        if (!adap)

diff --git a/drivers/i2c/busses/i2c-img-scb.c b/drivers/i2c/busses/i2c-img-scb.c
index c937ea79300c1882b83ab1b61c26a0275e8fe569..98a89301ed2a6cc87dc0f08b9eebe93cb5fbfc7b 100644 (file)
--- a/drivers/i2c/busses/i2c-img-scb.c
+++ b/drivers/i2c/busses/i2c-img-scb.c
@@ -1342,10 +1342,8 @@ static int img_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(i2c->base);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "can't get irq number\n");
+       if (irq < 0)
                return irq;
-       }
 
        i2c->sys_clk = devm_clk_get(&pdev->dev, "sys");
        if (IS_ERR(i2c->sys_clk)) {

diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c
index 94743ba581fe50c6e35014ca9e9c554d039973cd..9db6ccded5e9e796b08a4003855eba068d697680 100644 (file)
--- a/drivers/i2c/busses/i2c-imx-lpi2c.c
+++ b/drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -551,10 +551,8 @@ static int lpi2c_imx_probe(struct platform_device *pdev)
                return PTR_ERR(lpi2c_imx->base);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "can't get irq number\n");
+       if (irq < 0)
                return irq;
-       }
 
        lpi2c_imx->adapter.owner        = THIS_MODULE;
        lpi2c_imx->adapter.algo         = &lpi2c_imx_algo;

diff --git a/drivers/i2c/busses/i2c-lpc2k.c b/drivers/i2c/busses/i2c-lpc2k.c
index 197cb64b2a42d74f0448f79f421583f2ab4fbfc0..4e30c5267142c3ced1947088e8983c4888ea3da7 100644 (file)
--- a/drivers/i2c/busses/i2c-lpc2k.c
+++ b/drivers/i2c/busses/i2c-lpc2k.c
@@ -360,10 +360,8 @@ static int i2c_lpc2k_probe(struct platform_device *pdev)
                return PTR_ERR(i2c->base);
 
        i2c->irq = platform_get_irq(pdev, 0);
-       if (i2c->irq < 0) {
-               dev_err(&pdev->dev, "can't get interrupt resource\n");
+       if (i2c->irq < 0)
                return i2c->irq;
-       }
 
        init_waitqueue_head(&i2c->wait);
 

diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
index b3bd869281d36c97a323b49861ba3b89194288d2..c5dec572fc48e65e2508ee6da56670f6ce60689b 100644 (file)
--- a/drivers/i2c/busses/i2c-meson.c
+++ b/drivers/i2c/busses/i2c-meson.c
@@ -426,10 +426,8 @@ static int meson_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(i2c->regs);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "can't find IRQ\n");
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(&pdev->dev, irq, meson_i2c_irq, 0, NULL, i2c);
        if (ret < 0) {

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 71b4637c86b7915a1bbd02389bc2f4edebdb73bb..175c590b93b76cbd72b8270ced91a78dad14ddae 100644 (file)
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1365,10 +1365,8 @@ omap_i2c_probe(struct platform_device *pdev)
        u16 minor, major;
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "no irq resource?\n");
+       if (irq < 0)
                return irq;
-       }
 
        omap = devm_kzalloc(&pdev->dev, sizeof(struct omap_i2c_dev), GFP_KERNEL);
        if (!omap)

diff --git a/drivers/i2c/busses/i2c-owl.c b/drivers/i2c/busses/i2c-owl.c
index fba6efc1dca854839de9f289f404a2cec70fbbe0..672f1f239bd6f85c2ebe5559688258d8bf42a242 100644 (file)
--- a/drivers/i2c/busses/i2c-owl.c
+++ b/drivers/i2c/busses/i2c-owl.c
@@ -407,10 +407,8 @@ static int owl_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(i2c_dev->base);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "failed to get IRQ number\n");
+       if (irq < 0)
                return irq;
-       }
 
        if (of_property_read_u32(dev->of_node, "clock-frequency",
                                 &i2c_dev->bus_freq))

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 686c06f316253a416c175c6e1e69e3da1fbc1626..5d7207c10f1dc69b56541825162ee2b46bc74974 100644 (file)
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -720,7 +720,6 @@ static int i2c_pnx_probe(struct platform_device *pdev)
 
        alg_data->irq = platform_get_irq(pdev, 0);
        if (alg_data->irq < 0) {
-               dev_err(&pdev->dev, "Failed to get IRQ from platform resource\n");
                ret = alg_data->irq;
                goto out_clock;
        }

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 466e4f681d7a4eefd4f1316d21bcb39b7ea680be..37246cbbe14c44e78851d42e65d72d17aeab3bc8 100644 (file)
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1267,10 +1267,8 @@ static int i2c_pxa_probe(struct platform_device *dev)
                return PTR_ERR(i2c->reg_base);
 
        irq = platform_get_irq(dev, 0);
-       if (irq < 0) {
-               dev_err(&dev->dev, "no irq resource: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        /* Default adapter num to device id; i2c_pxa_probe_dt can override. */
        i2c->adap.nr = dev->id;

diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index 155dcde70fc97241330661c78d2c7ebf10bf6956..0e3525fe613f82e40f6587223ffc061c0a115556 100644 (file)
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -1761,10 +1761,8 @@ nodma:
                return PTR_ERR(qup->base);
 
        qup->irq = platform_get_irq(pdev, 0);
-       if (qup->irq < 0) {
-               dev_err(qup->dev, "No IRQ defined\n");
+       if (qup->irq < 0)
                return qup->irq;
-       }
 
        if (has_acpi_companion(qup->dev)) {
                ret = device_property_read_u32(qup->dev,

diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index fbe41c8cc126aad842117ebd4ddb3e0338e1e531..bc698240c4aaa786ae5f46e7c3907852daea0547 100644 (file)
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -1260,10 +1260,8 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
 
        /* IRQ setup */
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(&pdev->dev, "cannot find rk3x IRQ\n");
+       if (irq < 0)
                return irq;
-       }
 
        ret = devm_request_irq(&pdev->dev, irq, rk3x_i2c_irq,
                               0, dev_name(&pdev->dev), i2c);

diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c
index 123a42bfe3b1b77a2e153a2e01f990af10af97d8..19cda6742423d98ab3d53a897d1897ac6e93eae4 100644 (file)
--- a/drivers/i2c/busses/i2c-sprd.c
+++ b/drivers/i2c/busses/i2c-sprd.c
@@ -492,10 +492,8 @@ static int sprd_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(i2c_dev->base);
 
        i2c_dev->irq = platform_get_irq(pdev, 0);
-       if (i2c_dev->irq < 0) {
-               dev_err(&pdev->dev, "failed to get irq resource\n");
+       if (i2c_dev->irq < 0)
                return i2c_dev->irq;
-       }
 
        i2c_set_adapdata(&i2c_dev->adap, i2c_dev);
        init_completion(&i2c_dev->complete);

diff --git a/drivers/i2c/busses/i2c-sun6i-p2wi.c b/drivers/i2c/busses/i2c-sun6i-p2wi.c
index 17c27f79029ba14bfea885be0cc73bb9ff7a2250..2f6f6468214ddd6519dc5372db66193f8f982dc4 100644 (file)
--- a/drivers/i2c/busses/i2c-sun6i-p2wi.c
+++ b/drivers/i2c/busses/i2c-sun6i-p2wi.c
@@ -236,10 +236,8 @@ static int p2wi_probe(struct platform_device *pdev)
 
        strlcpy(p2wi->adapter.name, pdev->name, sizeof(p2wi->adapter.name));
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "failed to retrieve irq: %d\n", irq);
+       if (irq < 0)
                return irq;
-       }
 
        p2wi->clk = devm_clk_get(dev, NULL);
        if (IS_ERR(p2wi->clk)) {

diff --git a/drivers/i2c/busses/i2c-synquacer.c b/drivers/i2c/busses/i2c-synquacer.c
index 8cc91a8da5a0f63cc0a629187b1b6657592ded4e..c9a3dba6a75d306874dd9fdf41b7bd7cfdd4b2a6 100644 (file)
--- a/drivers/i2c/busses/i2c-synquacer.c
+++ b/drivers/i2c/busses/i2c-synquacer.c
@@ -578,10 +578,8 @@ static int synquacer_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(i2c->base);
 
        i2c->irq = platform_get_irq(pdev, 0);
-       if (i2c->irq < 0) {
-               dev_err(&pdev->dev, "no IRQ resource found\n");
+       if (i2c->irq < 0)
                return -ENODEV;
-       }
 
        ret = devm_request_irq(&pdev->dev, i2c->irq, synquacer_i2c_isr,
                               0, dev_name(&pdev->dev), i2c);

diff --git a/drivers/i2c/busses/i2c-uniphier-f.c b/drivers/i2c/busses/i2c-uniphier-f.c
index 2b258d54d68cf689256629e991607ee4308910cb..cb4666c54a233023efb7663e89e51a1977a07f7b 100644 (file)
--- a/drivers/i2c/busses/i2c-uniphier-f.c
+++ b/drivers/i2c/busses/i2c-uniphier-f.c
@@ -529,10 +529,8 @@ static int uniphier_fi2c_probe(struct platform_device *pdev)
                return PTR_ERR(priv->membase);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "failed to get IRQ number\n");
+       if (irq < 0)
                return irq;
-       }
 
        if (of_property_read_u32(dev->of_node, "clock-frequency", &bus_speed))
                bus_speed = I2C_MAX_STANDARD_MODE_FREQ;

diff --git a/drivers/i2c/busses/i2c-uniphier.c b/drivers/i2c/busses/i2c-uniphier.c
index 668b1fa2b0ef42419099b827325b20b4c84b4606..ee00a44bf4c719bd19d1f51fdcc15616dea97145 100644 (file)
--- a/drivers/i2c/busses/i2c-uniphier.c
+++ b/drivers/i2c/busses/i2c-uniphier.c
@@ -324,10 +324,8 @@ static int uniphier_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(priv->membase);
 
        irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               dev_err(dev, "failed to get IRQ number\n");
+       if (irq < 0)
                return irq;
-       }
 
        if (of_property_read_u32(dev->of_node, "clock-frequency", &bus_speed))
                bus_speed = I2C_MAX_STANDARD_MODE_FREQ;

diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c
index 286faa9c855ea785c09bb49eaeac7dd18699dd65..f2241cedf5d3ffa21b11152bd97d2f94993153c6 100644 (file)
--- a/drivers/i2c/busses/i2c-xlp9xx.c
+++ b/drivers/i2c/busses/i2c-xlp9xx.c
@@ -517,10 +517,8 @@ static int xlp9xx_i2c_probe(struct platform_device *pdev)
                return PTR_ERR(priv->base);
 
        priv->irq = platform_get_irq(pdev, 0);
-       if (priv->irq <= 0) {
-               dev_err(&pdev->dev, "invalid irq!\n");
+       if (priv->irq <= 0)
                return priv->irq;
-       }
        /* SMBAlert irq */
        priv->alert_data.irq = platform_get_irq(pdev, 1);
        if (priv->alert_data.irq <= 0)