diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2021-04-02 20:43:26 +0300 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2021-04-02 12:53:19 -0500 |
| commit | ea63a26e2b7105d3bef517d1ca893b9e666488a8 (patch) | |
| tree | c848aaa6756650e8adf8075b940b90a9289fcbdb /drivers/char | |
| parent | 079dea006fb819c2f24f975da6627b161108083d (diff) | |
| download | linux-ea63a26e2b7105d3bef517d1ca893b9e666488a8.tar.gz | |
ipmi_si: Remove bogus err_free label
There is no more 'free' in the error path, so drop the label and return errors inline. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Message-Id: <20210402174334.13466-3-andriy.shevchenko@linux.intel.com> Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_platform.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c index 8f2fefc015b2..e5cd5006f0e5 100644 --- a/drivers/char/ipmi/ipmi_si_platform.c +++ b/drivers/char/ipmi/ipmi_si_platform.c @@ -316,7 +316,6 @@ static int acpi_ipmi_probe(struct platform_device *pdev) acpi_status status; unsigned long long tmp; struct resource *res; - int rv = -EINVAL; if (!si_tryacpi) return -ENODEV; @@ -336,7 +335,7 @@ static int acpi_ipmi_probe(struct platform_device *pdev) if (ACPI_FAILURE(status)) { dev_err(&pdev->dev, "Could not find ACPI IPMI interface type\n"); - goto err_free; + return -EINVAL; } switch (tmp) { @@ -350,21 +349,18 @@ static int acpi_ipmi_probe(struct platform_device *pdev) io.si_type = SI_BT; break; case 4: /* SSIF, just ignore */ - rv = -ENODEV; - goto err_free; + return -ENODEV; default: dev_info(&pdev->dev, "unknown IPMI type %lld\n", tmp); - goto err_free; + return -EINVAL; } io.regsize = DEFAULT_REGSIZE; io.regshift = 0; res = ipmi_get_info_from_resources(pdev, &io); - if (!res) { - rv = -EINVAL; - goto err_free; - } + if (!res) + return -EINVAL; /* If _GPE exists, use it; otherwise use standard interrupts */ status = acpi_evaluate_integer(handle, "_GPE", NULL, &tmp); @@ -390,9 +386,6 @@ static int acpi_ipmi_probe(struct platform_device *pdev) request_module("acpi_ipmi"); return ipmi_si_add_smi(&io); - -err_free: - return rv; } static const struct acpi_device_id acpi_ipmi_match[] = { |