hwmon: (chipcap2) Drop cc2_disable() in the probe and return dev_err_probe()

There is no need to actively disable a regulator that has not been
enabled by the driver, which makes the call to cc2_disable() in the
probe function meaningless, because the probe function never enables
the device's dedicated regulator.

Once the call to cc2_disable() is dropped, the error paths can directly
return dev_err_probe() in all cases.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Message-ID: <20240813-chipcap2-probe-improvements-v2-1-e9a2932a8a00@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/chipcap2.c b/drivers/hwmon/chipcap2.c
index 6ccceae21f701aacd7bd64c671925d7f79bde9bd..edf454474f11c9300a1b6ea7b27f72760173617c 100644 (file)
--- a/drivers/hwmon/chipcap2.c
+++ b/drivers/hwmon/chipcap2.c
@@ -740,37 +740,26 @@ static int cc2_probe(struct i2c_client *client)
        data->client = client;
 
        data->regulator = devm_regulator_get_exclusive(dev, "vdd");
-       if (IS_ERR(data->regulator)) {
-               dev_err_probe(dev, PTR_ERR(data->regulator),
-                             "Failed to get regulator\n");
-               return PTR_ERR(data->regulator);
-       }
+       if (IS_ERR(data->regulator))
+               return dev_err_probe(dev, PTR_ERR(data->regulator),
+                                    "Failed to get regulator\n");
 
        ret = cc2_request_ready_irq(data, dev);
-       if (ret) {
-               dev_err_probe(dev, ret, "Failed to request ready irq\n");
-               return ret;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to request ready irq\n");
 
        ret = cc2_request_alarm_irqs(data, dev);
-       if (ret) {
-               dev_err_probe(dev, ret, "Failed to request alarm irqs\n");
-               goto disable;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to request alarm irqs\n");
 
        data->hwmon = devm_hwmon_device_register_with_info(dev, client->name,
                                                           data, &cc2_chip_info,
                                                           NULL);
-       if (IS_ERR(data->hwmon)) {
-               dev_err_probe(dev, PTR_ERR(data->hwmon),
-                             "Failed to register hwmon device\n");
-               ret = PTR_ERR(data->hwmon);
-       }
-
-disable:
-       cc2_disable(data);
+       if (IS_ERR(data->hwmon))
+               return dev_err_probe(dev, PTR_ERR(data->hwmon),
+                                    "Failed to register hwmon device\n");
 
-       return ret;
+       return 0;
 }
 
 static void cc2_remove(struct i2c_client *client)