]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
i2c: viai2c-wmt: Replace dev_err() with dev_err_probe() in probe function
authorEnrico Zanda <e.zanda1@gmail.com>
Tue, 13 May 2025 21:02:47 +0000 (23:02 +0200)
committerAndi Shyti <andi@smida.it>
Fri, 23 May 2025 08:02:27 +0000 (10:02 +0200)
This simplifies the code while improving log.

Signed-off-by: Enrico Zanda <e.zanda1@gmail.com>
Link: https://lore.kernel.org/r/20250513210246.528370-2-e.zanda1@gmail.com
Signed-off-by: Andi Shyti <andi@smida.it>
drivers/i2c/busses/i2c-viai2c-wmt.c

index 4eb740faf268d90675b16c813cd7a32c665c212a..2cf3cc0165fbcda19b6d7f9e6f4eaed287366b81 100644 (file)
@@ -44,16 +44,13 @@ static int wmt_i2c_reset_hardware(struct viai2c *i2c)
        int err;
 
        err = clk_prepare_enable(i2c->clk);
-       if (err) {
-               dev_err(i2c->dev, "failed to enable clock\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(i2c->dev, err, "failed to enable clock\n");
 
        err = clk_set_rate(i2c->clk, 20000000);
        if (err) {
-               dev_err(i2c->dev, "failed to set clock = 20Mhz\n");
                clk_disable_unprepare(i2c->clk);
-               return err;
+               return dev_err_probe(i2c->dev, err, "failed to set clock = 20Mhz\n");
        }
 
        writew(0, i2c->base + VIAI2C_REG_CR);
@@ -121,10 +118,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)
                                "failed to request irq %i\n", i2c->irq);
 
        i2c->clk = of_clk_get(np, 0);
-       if (IS_ERR(i2c->clk)) {
-               dev_err(&pdev->dev, "unable to request clock\n");
-               return PTR_ERR(i2c->clk);
-       }
+       if (IS_ERR(i2c->clk))
+               return dev_err_probe(&pdev->dev, PTR_ERR(i2c->clk),
+                                    "unable to request clock\n");
 
        err = of_property_read_u32(np, "clock-frequency", &clk_rate);
        if (!err && clk_rate == I2C_MAX_FAST_MODE_FREQ)
@@ -139,10 +135,8 @@ static int wmt_i2c_probe(struct platform_device *pdev)
        adap->dev.of_node = pdev->dev.of_node;
 
        err = wmt_i2c_reset_hardware(i2c);
-       if (err) {
-               dev_err(&pdev->dev, "error initializing hardware\n");
+       if (err)
                return err;
-       }
 
        err = i2c_add_adapter(adap);
        if (err)