| Message ID | 1597203954-1803-1-git-send-email-Anson.Huang@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i2c: imx: Use dev_err_probe() to simplify error handling | expand |
On Wed, Aug 12, 2020 at 11:45:54AM +0800, Anson Huang wrote: > dev_err_probe() can reduce code size, uniform error handling and record the > defer probe reason etc., use it to simplify the code. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> > --- > drivers/i2c/busses/i2c-imx.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > index 0ab5381..63f4367 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -1159,11 +1159,9 @@ static int i2c_imx_probe(struct platform_device *pdev) > > /* Get I2C clock */ > i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(i2c_imx->clk)) { > - if (PTR_ERR(i2c_imx->clk) != -EPROBE_DEFER) > - dev_err(&pdev->dev, "can't get I2C clock\n"); > - return PTR_ERR(i2c_imx->clk); > - } > + if (IS_ERR(i2c_imx->clk)) > + return dev_err_probe(&pdev->dev, PTR_ERR(i2c_imx->clk), > + "can't get I2C clock\n"); > > ret = clk_prepare_enable(i2c_imx->clk); > if (ret) { > -- Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
On Wed, Aug 12, 2020 at 11:45:54AM +0800, Anson Huang wrote: > dev_err_probe() can reduce code size, uniform error handling and record the > defer probe reason etc., use it to simplify the code. > > Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 0ab5381..63f4367 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -1159,11 +1159,9 @@ static int i2c_imx_probe(struct platform_device *pdev) /* Get I2C clock */ i2c_imx->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(i2c_imx->clk)) { - if (PTR_ERR(i2c_imx->clk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "can't get I2C clock\n"); - return PTR_ERR(i2c_imx->clk); - } + if (IS_ERR(i2c_imx->clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(i2c_imx->clk), + "can't get I2C clock\n"); ret = clk_prepare_enable(i2c_imx->clk); if (ret) {
dev_err_probe() can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> --- drivers/i2c/busses/i2c-imx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)