mfd: intel_soc_pmic_chtwc: Use dev_err_probe()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Thu, 16 Jun 2022 17:10:08 +0000 (20:10 +0300)
committerLee Jones <lee@kernel.org>
Tue, 19 Jul 2022 09:54:40 +0000 (10:54 +0100)
Simplify the mux error path a bit by using dev_err_probe().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220616171009.43524-1-andriy.shevchenko@linux.intel.com
drivers/mfd/intel_soc_pmic_chtwc.c

index 4eab191..1cbe2bc 100644 (file)
@@ -179,18 +179,13 @@ static int cht_wc_probe(struct i2c_client *client)
        int ret;
 
        status = acpi_evaluate_integer(ACPI_HANDLE(dev), "_HRV", NULL, &hrv);
-       if (ACPI_FAILURE(status)) {
-               dev_err(dev, "Failed to get PMIC hardware revision\n");
-               return -ENODEV;
-       }
-       if (hrv != CHT_WC_HRV) {
-               dev_err(dev, "Invalid PMIC hardware revision: %llu\n", hrv);
-               return -ENODEV;
-       }
-       if (client->irq < 0) {
-               dev_err(dev, "Invalid IRQ\n");
-               return -EINVAL;
-       }
+       if (ACPI_FAILURE(status))
+               return dev_err_probe(dev, -ENODEV, "Failed to get PMIC hardware revision\n");
+       if (hrv != CHT_WC_HRV)
+               return dev_err_probe(dev, -ENODEV, "Invalid PMIC hardware revision: %llu\n", hrv);
+
+       if (client->irq < 0)
+               return dev_err_probe(dev, -EINVAL, "Invalid IRQ\n");
 
        pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);
        if (!pmic)