| Message ID | 20200902150643.14839-4-krzk@kernel.org |
|---|---|
| State | Accepted |
| Commit | 2d1a83a4f36f1a6fd8c510db409772e34bf4eed1 |
| Headers | show |
| Series | [1/9] i2c: stm32: Simplify with dev_err_probe() | expand |
st 2. 9. 2020 v 17:10 odesÃlatel Krzysztof Kozlowski <krzk@kernel.org> napsal: > > Common pattern of handling deferred probe can be simplified with > dev_err_probe(). Less code and the error value gets printed. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > drivers/i2c/busses/i2c-cadence.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c > index e4b7f2a951ad..eefde554c50c 100644 > --- a/drivers/i2c/busses/i2c-cadence.c > +++ b/drivers/i2c/busses/i2c-cadence.c > @@ -1214,11 +1214,10 @@ static int cdns_i2c_probe(struct platform_device *pdev) > "Cadence I2C at %08lx", (unsigned long)r_mem->start); > > id->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(id->clk)) { > - if (PTR_ERR(id->clk) != -EPROBE_DEFER) > - dev_err(&pdev->dev, "input clock not found.\n"); > - return PTR_ERR(id->clk); > - } > + if (IS_ERR(id->clk)) > + return dev_err_probe(&pdev->dev, PTR_ERR(id->clk), > + "input clock not found.\n"); > + > ret = clk_prepare_enable(id->clk); > if (ret) > dev_err(&pdev->dev, "Unable to enable clock.\n"); > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel Also this one is pending but still possible to apply without any conflict. Acked-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
On Wed, Sep 02, 2020 at 05:06:38PM +0200, Krzysztof Kozlowski wrote: > Common pattern of handling deferred probe can be simplified with > dev_err_probe(). Less code and the error value gets printed. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c index e4b7f2a951ad..eefde554c50c 100644 --- a/drivers/i2c/busses/i2c-cadence.c +++ b/drivers/i2c/busses/i2c-cadence.c @@ -1214,11 +1214,10 @@ static int cdns_i2c_probe(struct platform_device *pdev) "Cadence I2C at %08lx", (unsigned long)r_mem->start); id->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(id->clk)) { - if (PTR_ERR(id->clk) != -EPROBE_DEFER) - dev_err(&pdev->dev, "input clock not found.\n"); - return PTR_ERR(id->clk); - } + if (IS_ERR(id->clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(id->clk), + "input clock not found.\n"); + ret = clk_prepare_enable(id->clk); if (ret) dev_err(&pdev->dev, "Unable to enable clock.\n");
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- drivers/i2c/busses/i2c-cadence.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)