Skip to content

Commit 437e6c3

Browse files
benoitmoninWolfram Sang
authored andcommitted
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>
1 parent 0de6194 commit 437e6c3

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

drivers/i2c/busses/i2c-designware-master.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,11 +1068,10 @@ int i2c_dw_probe_master(struct dw_i2c_dev *dev)
10681068
if (!(dev->flags & ACCESS_POLLING)) {
10691069
ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr,
10701070
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);
10761075
}
10771076

10781077
ret = i2c_dw_init_recovery_info(dev);

drivers/i2c/busses/i2c-designware-slave.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,10 @@ int i2c_dw_probe_slave(struct dw_i2c_dev *dev)
266266

267267
ret = devm_request_irq(dev->dev, dev->irq, i2c_dw_isr_slave,
268268
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);
274273

275274
ret = i2c_add_numbered_adapter(adap);
276275
if (ret)

0 commit comments

Comments
 (0)