Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

i2c: viai2c-wmt: Replace dev_err() with dev_err_probe() in probe function

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>

authored by

Enrico Zanda and committed by
Andi Shyti
3b7d8d15 bdf4442f

+7 -13
+7 -13
drivers/i2c/busses/i2c-viai2c-wmt.c
··· 44 44 int err; 45 45 46 46 err = clk_prepare_enable(i2c->clk); 47 - if (err) { 48 - dev_err(i2c->dev, "failed to enable clock\n"); 49 - return err; 50 - } 47 + if (err) 48 + return dev_err_probe(i2c->dev, err, "failed to enable clock\n"); 51 49 52 50 err = clk_set_rate(i2c->clk, 20000000); 53 51 if (err) { 54 - dev_err(i2c->dev, "failed to set clock = 20Mhz\n"); 55 52 clk_disable_unprepare(i2c->clk); 56 - return err; 53 + return dev_err_probe(i2c->dev, err, "failed to set clock = 20Mhz\n"); 57 54 } 58 55 59 56 writew(0, i2c->base + VIAI2C_REG_CR); ··· 118 121 "failed to request irq %i\n", i2c->irq); 119 122 120 123 i2c->clk = of_clk_get(np, 0); 121 - if (IS_ERR(i2c->clk)) { 122 - dev_err(&pdev->dev, "unable to request clock\n"); 123 - return PTR_ERR(i2c->clk); 124 - } 124 + if (IS_ERR(i2c->clk)) 125 + return dev_err_probe(&pdev->dev, PTR_ERR(i2c->clk), 126 + "unable to request clock\n"); 125 127 126 128 err = of_property_read_u32(np, "clock-frequency", &clk_rate); 127 129 if (!err && clk_rate == I2C_MAX_FAST_MODE_FREQ) ··· 135 139 adap->dev.of_node = pdev->dev.of_node; 136 140 137 141 err = wmt_i2c_reset_hardware(i2c); 138 - if (err) { 139 - dev_err(&pdev->dev, "error initializing hardware\n"); 142 + if (err) 140 143 return err; 141 - } 142 144 143 145 err = i2c_add_adapter(adap); 144 146 if (err)