Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Benoît Monin and committed by
Wolfram Sang
437e6c3e 0de61943

+8 -10
+4 -5
drivers/i2c/busses/i2c-designware-master.c
··· 1068 1068 if (!(dev->flags & ACCESS_POLLING)) { 1069 1069 ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr, 1070 1070 irq_flags, dev_name(dev->dev), dev); 1071 - if (ret) { 1072 - dev_err(dev->dev, "failure requesting irq %i: %d\n", 1073 - dev->irq, ret); 1074 - return ret; 1075 - } 1071 + if (ret) 1072 + return dev_err_probe(dev->dev, ret, 1073 + "failure requesting irq %i: %d\n", 1074 + dev->irq, ret); 1076 1075 } 1077 1076 1078 1077 ret = i2c_dw_init_recovery_info(dev);
+4 -5
drivers/i2c/busses/i2c-designware-slave.c
··· 266 266 267 267 ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr_slave, 268 268 IRQF_SHARED, dev_name(dev->dev), dev); 269 - if (ret) { 270 - dev_err(dev->dev, "failure requesting IRQ %i: %d\n", 271 - dev->irq, ret); 272 - return ret; 273 - } 269 + if (ret) 270 + return dev_err_probe(dev->dev, ret, 271 + "failure requesting IRQ %i: %d\n", 272 + dev->irq, ret); 274 273 275 274 ret = i2c_add_numbered_adapter(adap); 276 275 if (ret)