| Message ID | 20230728013148.1720978-5-liaochang1@huawei.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Andi Shyti |
| Headers | show |
| Series | Use dev_err_probe in i2c probe function | expand |
On 2023/7/28 9:31, Liao Chang wrote: > Use the dev_err_probe function instead of dev_err in the probe function > so that the printed messge includes the return value and also handles > -EPROBE_DEFER nicely. > > Signed-off-by: Liao Chang <liaochang1@huawei.com> Reviewed-by: Yicong Yang <yangyicong@hisilicon.com> > --- > drivers/i2c/busses/i2c-hisi.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c > index e067671b3ce2..6fc8d6fa43b6 100644 > --- a/drivers/i2c/busses/i2c-hisi.c > +++ b/drivers/i2c/busses/i2c-hisi.c > @@ -462,18 +462,14 @@ static int hisi_i2c_probe(struct platform_device *pdev) > hisi_i2c_disable_int(ctlr, HISI_I2C_INT_ALL); > > ret = devm_request_irq(dev, ctlr->irq, hisi_i2c_irq, 0, "hisi-i2c", ctlr); > - if (ret) { > - dev_err(dev, "failed to request irq handler, ret = %d\n", ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "failed to request irq handler\n"); > > ctlr->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL); > if (IS_ERR_OR_NULL(ctlr->clk)) { > ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz); > - if (ret) { > - dev_err(dev, "failed to get clock frequency, ret = %d\n", ret); > - return ret; > - } > + if (ret) > + return dev_err_probe(dev, ret, "failed to get clock frequency\n"); > } else { > clk_rate_hz = clk_get_rate(ctlr->clk); > } >
diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c index e067671b3ce2..6fc8d6fa43b6 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -462,18 +462,14 @@ static int hisi_i2c_probe(struct platform_device *pdev) hisi_i2c_disable_int(ctlr, HISI_I2C_INT_ALL); ret = devm_request_irq(dev, ctlr->irq, hisi_i2c_irq, 0, "hisi-i2c", ctlr); - if (ret) { - dev_err(dev, "failed to request irq handler, ret = %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "failed to request irq handler\n"); ctlr->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL); if (IS_ERR_OR_NULL(ctlr->clk)) { ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz); - if (ret) { - dev_err(dev, "failed to get clock frequency, ret = %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "failed to get clock frequency\n"); } else { clk_rate_hz = clk_get_rate(ctlr->clk); }
Use the dev_err_probe function instead of dev_err in the probe function so that the printed messge includes the return value and also handles -EPROBE_DEFER nicely. Signed-off-by: Liao Chang <liaochang1@huawei.com> --- drivers/i2c/busses/i2c-hisi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)