i2c: stm32f7: 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>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20250520194400.341079-5-e.zanda1@gmail.com

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index 70cb5822bf17bfe8b5c6949cd304759026f8677c..e7cc7f0fb56ce0edbc6adb5530c808fb08659a0d 100644 (file)
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -481,28 +481,22 @@ static int stm32f7_i2c_compute_timing(struct stm32f7_i2c_dev *i2c_dev,
        int ret = 0;
 
        specs = stm32f7_get_specs(setup->speed_freq);
-       if (specs == ERR_PTR(-EINVAL)) {
-               dev_err(i2c_dev->dev, "speed out of bound {%d}\n",
-                       setup->speed_freq);
-               return -EINVAL;
-       }
+       if (specs == ERR_PTR(-EINVAL))
+               return dev_err_probe(i2c_dev->dev, -EINVAL, "speed out of bound {%d}\n",
+                                    setup->speed_freq);
 
        if ((setup->rise_time > specs->rise_max) ||
-           (setup->fall_time > specs->fall_max)) {
-               dev_err(i2c_dev->dev,
-                       "timings out of bound Rise{%d>%d}/Fall{%d>%d}\n",
-                       setup->rise_time, specs->rise_max,
-                       setup->fall_time, specs->fall_max);
-               return -EINVAL;
-       }
+           (setup->fall_time > specs->fall_max))
+               return dev_err_probe(i2c_dev->dev, -EINVAL,
+                                    "timings out of bound Rise{%d>%d}/Fall{%d>%d}\n",
+                                    setup->rise_time, specs->rise_max,
+                                    setup->fall_time, specs->fall_max);
 
        i2c_dev->dnf = DIV_ROUND_CLOSEST(i2c_dev->dnf_dt, i2cclk);
-       if (i2c_dev->dnf > STM32F7_I2C_DNF_MAX) {
-               dev_err(i2c_dev->dev,
-                       "DNF out of bound %d/%d\n",
-                       i2c_dev->dnf * i2cclk, STM32F7_I2C_DNF_MAX * i2cclk);
-               return -EINVAL;
-       }
+       if (i2c_dev->dnf > STM32F7_I2C_DNF_MAX)
+               return dev_err_probe(i2c_dev->dev, -EINVAL,
+                                    "DNF out of bound %d/%d\n", i2c_dev->dnf * i2cclk,
+                                    STM32F7_I2C_DNF_MAX * i2cclk);
 
        /*  Analog and Digital Filters */
        af_delay_min =
@@ -567,8 +561,7 @@ static int stm32f7_i2c_compute_timing(struct stm32f7_i2c_dev *i2c_dev,
        }
 
        if (list_empty(&solutions)) {
-               dev_err(i2c_dev->dev, "no Prescaler solution\n");
-               ret = -EPERM;
+               ret = dev_err_probe(i2c_dev->dev, -EPERM, "no Prescaler solution\n");
                goto exit;
        }
 
@@ -624,8 +617,7 @@ static int stm32f7_i2c_compute_timing(struct stm32f7_i2c_dev *i2c_dev,
        }
 
        if (!s) {
-               dev_err(i2c_dev->dev, "no solution at all\n");
-               ret = -EPERM;
+               ret = dev_err_probe(i2c_dev->dev, -EPERM, "no solution at all\n");
                goto exit;
        }
 
@@ -674,11 +666,9 @@ static int stm32f7_i2c_setup_timing(struct stm32f7_i2c_dev *i2c_dev,
 
        i2c_parse_fw_timings(i2c_dev->dev, t, false);
 
-       if (t->bus_freq_hz > I2C_MAX_FAST_MODE_PLUS_FREQ) {
-               dev_err(i2c_dev->dev, "Invalid bus speed (%i>%i)\n",
-                       t->bus_freq_hz, I2C_MAX_FAST_MODE_PLUS_FREQ);
-               return -EINVAL;
-       }
+       if (t->bus_freq_hz > I2C_MAX_FAST_MODE_PLUS_FREQ)
+               return dev_err_probe(i2c_dev->dev, -EINVAL, "Invalid bus speed (%i>%i)\n",
+                                    t->bus_freq_hz, I2C_MAX_FAST_MODE_PLUS_FREQ);
 
        setup->speed_freq = t->bus_freq_hz;
        i2c_dev->setup.rise_time = t->scl_rise_ns;
@@ -686,10 +676,8 @@ static int stm32f7_i2c_setup_timing(struct stm32f7_i2c_dev *i2c_dev,
        i2c_dev->dnf_dt = t->digital_filter_width_ns;
        setup->clock_src = clk_get_rate(i2c_dev->clk);
 
-       if (!setup->clock_src) {
-               dev_err(i2c_dev->dev, "clock rate is 0\n");
-               return -EINVAL;
-       }
+       if (!setup->clock_src)
+               return dev_err_probe(i2c_dev->dev, -EINVAL, "clock rate is 0\n");
 
        if (!of_property_read_bool(i2c_dev->dev->of_node, "i2c-digital-filter"))
                i2c_dev->dnf_dt = STM32F7_I2C_DNF_DEFAULT;
@@ -698,8 +686,8 @@ static int stm32f7_i2c_setup_timing(struct stm32f7_i2c_dev *i2c_dev,
                ret = stm32f7_i2c_compute_timing(i2c_dev, setup,
                                                 &i2c_dev->timing);
                if (ret) {
-                       dev_err(i2c_dev->dev,
-                               "failed to compute I2C timings.\n");
+                       dev_err_probe(i2c_dev->dev, ret,
+                                     "failed to compute I2C timings.\n");
                        if (setup->speed_freq <= I2C_MAX_STANDARD_MODE_FREQ)
                                break;
                        setup->speed_freq =
@@ -710,10 +698,8 @@ static int stm32f7_i2c_setup_timing(struct stm32f7_i2c_dev *i2c_dev,
                }
        } while (ret);
 
-       if (ret) {
-               dev_err(i2c_dev->dev, "Impossible to compute I2C timings.\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(i2c_dev->dev, ret, "Impossible to compute I2C timings.\n");
 
        i2c_dev->analog_filter = of_property_read_bool(i2c_dev->dev->of_node,
                                                       "i2c-analog-filter");
@@ -2175,10 +2161,8 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        setup = of_device_get_match_data(&pdev->dev);
-       if (!setup) {
-               dev_err(&pdev->dev, "Can't get device data\n");
-               return -ENODEV;
-       }
+       if (!setup)
+               return dev_err_probe(&pdev->dev, -ENODEV, "Can't get device data\n");
        i2c_dev->setup = *setup;
 
        i2c_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
@@ -2279,7 +2263,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
 
                ret = dev_pm_set_wake_irq(i2c_dev->dev, irq_event);
                if (ret) {
-                       dev_err(i2c_dev->dev, "Failed to set wake up irq\n");
+                       dev_err_probe(i2c_dev->dev, ret, "Failed to set wake up irq\n");
                        goto clr_wakeup_capable;
                }
        }
@@ -2305,9 +2289,8 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
        if (i2c_dev->smbus_mode) {
                ret = stm32f7_i2c_enable_smbus_host(i2c_dev);
                if (ret) {
-                       dev_err(i2c_dev->dev,
-                               "failed to enable SMBus Host-Notify protocol (%d)\n",
-                               ret);
+                       dev_err_probe(i2c_dev->dev, ret,
+                                     "failed to enable SMBus Host-Notify protocol\n");
                        goto i2c_adapter_remove;
                }
        }
@@ -2315,9 +2298,8 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
        if (of_property_read_bool(pdev->dev.of_node, "smbus-alert")) {
                ret = stm32f7_i2c_enable_smbus_alert(i2c_dev);
                if (ret) {
-                       dev_err(i2c_dev->dev,
-                               "failed to enable SMBus alert protocol (%d)\n",
-                               ret);
+                       dev_err_probe(i2c_dev->dev, ret,
+                                     "failed to enable SMBus alert protocol\n");
                        goto i2c_disable_smbus_host;
                }
        }