Merge tag 'i2c-for-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[platform/kernel/linux-rpi.git] / drivers / i2c / busses / i2c-hisi.c

diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c
index 0980c77..dfad5ba 100644 (file)
--- a/drivers/i2c/busses/i2c-hisi.c
+++ b/drivers/i2c/busses/i2c-hisi.c
@@ -470,18 +470,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);
        }