diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2022-06-16 20:10:08 +0300 |
|---|---|---|
| committer | Lee Jones <lee@kernel.org> | 2022-07-19 12:54:40 +0300 |
| commit | 352de78076d005c7bca1e910774977b2f9a33e42 (patch) | |
| tree | 1aff67ca2fa827ab4eb90dd3c3009c4e29569e23 /drivers/mfd | |
| parent | c55333064d6ea9a26c7e8cfbe2ba1fa77c3a8e48 (diff) | |
| download | linux-352de78076d005c7bca1e910774977b2f9a33e42.tar.xz | |
mfd: intel_soc_pmic_chtwc: Use dev_err_probe()
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
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/intel_soc_pmic_chtwc.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/mfd/intel_soc_pmic_chtwc.c b/drivers/mfd/intel_soc_pmic_chtwc.c index 4eab191e053a..1cbe2bcce530 100644 --- a/drivers/mfd/intel_soc_pmic_chtwc.c +++ b/drivers/mfd/intel_soc_pmic_chtwc.c @@ -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) |