Skip to content

Commit 2b7a200

Browse files
benoitmoninWolfram Sang
authored andcommitted
i2c: designware: use dev_err_probe() when probing platform device
Add calls to dev_err_probe() on error paths that can return -EPROBE_DEFER when probing platform device. Namely when requesting the reset controller, when probing for lock support and when requesting the clocks. PCI device probing already use dev_err_probe(). 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 437e6c3 commit 2b7a200

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
238238

239239
dev->rst = devm_reset_control_get_optional_exclusive(device, NULL);
240240
if (IS_ERR(dev->rst))
241-
return PTR_ERR(dev->rst);
241+
return dev_err_probe(device, PTR_ERR(dev->rst), "failed to acquire reset\n");
242242

243243
reset_control_deassert(dev->rst);
244244

@@ -247,21 +247,23 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
247247
goto exit_reset;
248248

249249
ret = i2c_dw_probe_lock_support(dev);
250-
if (ret)
250+
if (ret) {
251+
ret = dev_err_probe(device, ret, "failed to probe lock support\n");
251252
goto exit_reset;
253+
}
252254

253255
i2c_dw_configure(dev);
254256

255257
/* Optional interface clock */
256258
dev->pclk = devm_clk_get_optional(device, "pclk");
257259
if (IS_ERR(dev->pclk)) {
258-
ret = PTR_ERR(dev->pclk);
260+
ret = dev_err_probe(device, PTR_ERR(dev->pclk), "failed to acquire pclk\n");
259261
goto exit_reset;
260262
}
261263

262264
dev->clk = devm_clk_get_optional(device, NULL);
263265
if (IS_ERR(dev->clk)) {
264-
ret = PTR_ERR(dev->clk);
266+
ret = dev_err_probe(device, PTR_ERR(dev->clk), "failed to acquire clock\n");
265267
goto exit_reset;
266268
}
267269

0 commit comments

Comments
 (0)