i2c: designware: convert to dev_err_probe() on request IRQ error

Simplify the error handling of devm_request_irq() in
i2c_dw_probe_master() and i2c_dw_probe_slave() by converting to:

    return dev_err_probe();

instead of calling:

    dev_err();
    return ret;

This also handle deferred probe error without spamming the log.

Signed-off-by: Benoît Monin <benoit.monin@bootlin.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index cbd88ffa561010ff2d29086836d9119da5b8885c..c7a72c28786c2b59a249a768d43a7954119bc018 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -1068,11 +1068,10 @@ int i2c_dw_probe_master(struct dw_i2c_dev *dev)
        if (!(dev->flags & ACCESS_POLLING)) {
                ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr,
                                       irq_flags, dev_name(dev->dev), dev);
-               if (ret) {
-                       dev_err(dev->dev, "failure requesting irq %i: %d\n",
-                               dev->irq, ret);
-                       return ret;
-               }
+               if (ret)
+                       return dev_err_probe(dev->dev, ret,
+                                            "failure requesting irq %i: %d\n",
+                                            dev->irq, ret);
        }
 
        ret = i2c_dw_init_recovery_info(dev);

diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c
index b936a240db0a9308f005148cdf4c4f9fd512be05..6eb16b7d75a6d059c7abcead609258f9d514d012 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-slave.c
+++ b/drivers/i2c/busses/i2c-designware-slave.c
@@ -266,11 +266,10 @@ int i2c_dw_probe_slave(struct dw_i2c_dev *dev)
 
        ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr_slave,
                               IRQF_SHARED, dev_name(dev->dev), dev);
-       if (ret) {
-               dev_err(dev->dev, "failure requesting IRQ %i: %d\n",
-                       dev->irq, ret);
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev->dev, ret,
+                                    "failure requesting IRQ %i: %d\n",
+                                    dev->irq, ret);
 
        ret = i2c_add_numbered_adapter(adap);
        if (ret)