| Message ID | 20210126202317.2914080-1-helgaas@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 10e927249c4f78b25c4941eda93548aeaad04a46 |
| Headers | show |
| Series | ACPI: Test for ACPI_SUCCESS rather than !ACPI_FAILURE | expand |
On Tue, Jan 26, 2021 at 02:23:17PM -0600, Bjorn Helgaas wrote: > From: Bjorn Helgaas <bhelgaas@google.com> > > The double negative makes it hard to read "if (!ACPI_FAILURE(status))". > Replace it with "if (ACPI_SUCCESS(status))". > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > --- > > This isn't really an ACPI patch, but I'm sending it to you, Rafael, since > it seems easier to just apply these all at once. But I'd be happy to split > them up into individual patches if you'd rather. Thanks, everybody. Rafael, I'll just merge this via my tree to avoid burdening you. > drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 4 ++-- > drivers/gpu/drm/radeon/radeon_bios.c | 4 ++-- > drivers/hwmon/acpi_power_meter.c | 4 ++-- > drivers/platform/x86/asus-laptop.c | 6 +++--- > drivers/spi/spi.c | 2 +- > sound/pci/hda/hda_intel.c | 4 ++-- > 6 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c > index 6333cada1e09..055f600eeed8 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c > @@ -291,7 +291,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) > continue; > > status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); > - if (!ACPI_FAILURE(status)) { > + if (ACPI_SUCCESS(status)) { > found = true; > break; > } > @@ -304,7 +304,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) > continue; > > status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); > - if (!ACPI_FAILURE(status)) { > + if (ACPI_SUCCESS(status)) { > found = true; > break; > } > diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c > index bb29cf02974d..43bbbfd6ade8 100644 > --- a/drivers/gpu/drm/radeon/radeon_bios.c > +++ b/drivers/gpu/drm/radeon/radeon_bios.c > @@ -205,7 +205,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) > continue; > > status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); > - if (!ACPI_FAILURE(status)) { > + if (ACPI_SUCCESS(status)) { > found = true; > break; > } > @@ -218,7 +218,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) > continue; > > status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); > - if (!ACPI_FAILURE(status)) { > + if (ACPI_SUCCESS(status)) { > found = true; > break; > } > diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c > index 848718ab7312..7d3ddcba34ce 100644 > --- a/drivers/hwmon/acpi_power_meter.c > +++ b/drivers/hwmon/acpi_power_meter.c > @@ -161,7 +161,7 @@ static ssize_t set_avg_interval(struct device *dev, > mutex_lock(&resource->lock); > status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PAI", > &args, &data); > - if (!ACPI_FAILURE(status)) > + if (ACPI_SUCCESS(status)) > resource->avg_interval = temp; > mutex_unlock(&resource->lock); > > @@ -232,7 +232,7 @@ static ssize_t set_cap(struct device *dev, struct device_attribute *devattr, > mutex_lock(&resource->lock); > status = acpi_evaluate_integer(resource->acpi_dev->handle, "_SHL", > &args, &data); > - if (!ACPI_FAILURE(status)) > + if (ACPI_SUCCESS(status)) > resource->cap = temp; > mutex_unlock(&resource->lock); > > diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c > index 0edafe687fa9..bfea656e910c 100644 > --- a/drivers/platform/x86/asus-laptop.c > +++ b/drivers/platform/x86/asus-laptop.c > @@ -861,7 +861,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr, > * The significance of others is yet to be found. > */ > rv = acpi_evaluate_integer(asus->handle, "SFUN", NULL, &temp); > - if (!ACPI_FAILURE(rv)) > + if (ACPI_SUCCESS(rv)) > len += sprintf(page + len, "SFUN value : %#x\n", > (uint) temp); > /* > @@ -873,7 +873,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr, > * takes several seconds to run on some systems. > */ > rv = acpi_evaluate_integer(asus->handle, "HWRS", NULL, &temp); > - if (!ACPI_FAILURE(rv)) > + if (ACPI_SUCCESS(rv)) > len += sprintf(page + len, "HWRS value : %#x\n", > (uint) temp); > /* > @@ -884,7 +884,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr, > * silently ignored. > */ > rv = acpi_evaluate_integer(asus->handle, "ASYM", NULL, &temp); > - if (!ACPI_FAILURE(rv)) > + if (ACPI_SUCCESS(rv)) > len += sprintf(page + len, "ASYM value : %#x\n", > (uint) temp); > if (asus->dsdt_info) { > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 720ab34784c1..801d8b499788 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -2210,7 +2210,7 @@ static acpi_status acpi_register_spi_device(struct spi_controller *ctlr, > return AE_OK; > > if (!lookup.max_speed_hz && > - !ACPI_FAILURE(acpi_get_parent(adev->handle, &parent_handle)) && > + ACPI_SUCCESS(acpi_get_parent(adev->handle, &parent_handle)) && > ACPI_HANDLE(ctlr->dev.parent) == parent_handle) { > /* Apple does not use _CRS but nested devices for SPI slaves */ > acpi_spi_parse_apple_properties(adev, &lookup); > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 770ad25f1907..fe8049cd2765 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -1444,7 +1444,7 @@ static bool atpx_present(void) > dhandle = ACPI_HANDLE(&pdev->dev); > if (dhandle) { > status = acpi_get_handle(dhandle, "ATPX", &atpx_handle); > - if (!ACPI_FAILURE(status)) { > + if (ACPI_SUCCESS(status)) { > pci_dev_put(pdev); > return true; > } > @@ -1454,7 +1454,7 @@ static bool atpx_present(void) > dhandle = ACPI_HANDLE(&pdev->dev); > if (dhandle) { > status = acpi_get_handle(dhandle, "ATPX", &atpx_handle); > - if (!ACPI_FAILURE(status)) { > + if (ACPI_SUCCESS(status)) { > pci_dev_put(pdev); > return true; > } > -- > 2.25.1 >
On Wed, Jan 27, 2021 at 4:16 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Tue, Jan 26, 2021 at 02:23:17PM -0600, Bjorn Helgaas wrote: > > From: Bjorn Helgaas <bhelgaas@google.com> > > > > The double negative makes it hard to read "if (!ACPI_FAILURE(status))". > > Replace it with "if (ACPI_SUCCESS(status))". > > > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > --- > > > > This isn't really an ACPI patch, but I'm sending it to you, Rafael, since > > it seems easier to just apply these all at once. But I'd be happy to split > > them up into individual patches if you'd rather. > > Thanks, everybody. Rafael, I'll just merge this via my tree to avoid > burdening you. It may conflict with some janitorial stuff I'm doing, though, so unless you've already applied it, I'd prefer to take it via the ACPI tree. Cheers!
On Wed, Jan 27, 2021 at 04:44:02PM +0100, Rafael J. Wysocki wrote: > On Wed, Jan 27, 2021 at 4:16 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > > > On Tue, Jan 26, 2021 at 02:23:17PM -0600, Bjorn Helgaas wrote: > > > From: Bjorn Helgaas <bhelgaas@google.com> > > > > > > The double negative makes it hard to read "if (!ACPI_FAILURE(status))". > > > Replace it with "if (ACPI_SUCCESS(status))". > > > > > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > > --- > > > > > > This isn't really an ACPI patch, but I'm sending it to you, Rafael, since > > > it seems easier to just apply these all at once. But I'd be happy to split > > > them up into individual patches if you'd rather. > > > > Thanks, everybody. Rafael, I'll just merge this via my tree to avoid > > burdening you. > > It may conflict with some janitorial stuff I'm doing, though, so > unless you've already applied it, I'd prefer to take it via the ACPI > tree. No problem, it's all yours! Bjorn
On Wed, Jan 27, 2021 at 5:06 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > On Wed, Jan 27, 2021 at 04:44:02PM +0100, Rafael J. Wysocki wrote: > > On Wed, Jan 27, 2021 at 4:16 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > > > > > On Tue, Jan 26, 2021 at 02:23:17PM -0600, Bjorn Helgaas wrote: > > > > From: Bjorn Helgaas <bhelgaas@google.com> > > > > > > > > The double negative makes it hard to read "if (!ACPI_FAILURE(status))". > > > > Replace it with "if (ACPI_SUCCESS(status))". > > > > > > > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > > > > --- > > > > > > > > This isn't really an ACPI patch, but I'm sending it to you, Rafael, since > > > > it seems easier to just apply these all at once. But I'd be happy to split > > > > them up into individual patches if you'd rather. > > > > > > Thanks, everybody. Rafael, I'll just merge this via my tree to avoid > > > burdening you. > > > > It may conflict with some janitorial stuff I'm doing, though, so > > unless you've already applied it, I'd prefer to take it via the ACPI > > tree. > > No problem, it's all yours! Applied as 5.12 material with the ACKs, thanks!
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c index 6333cada1e09..055f600eeed8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c @@ -291,7 +291,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) continue; status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); - if (!ACPI_FAILURE(status)) { + if (ACPI_SUCCESS(status)) { found = true; break; } @@ -304,7 +304,7 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) continue; status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); - if (!ACPI_FAILURE(status)) { + if (ACPI_SUCCESS(status)) { found = true; break; } diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c index bb29cf02974d..43bbbfd6ade8 100644 --- a/drivers/gpu/drm/radeon/radeon_bios.c +++ b/drivers/gpu/drm/radeon/radeon_bios.c @@ -205,7 +205,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) continue; status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); - if (!ACPI_FAILURE(status)) { + if (ACPI_SUCCESS(status)) { found = true; break; } @@ -218,7 +218,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) continue; status = acpi_get_handle(dhandle, "ATRM", &atrm_handle); - if (!ACPI_FAILURE(status)) { + if (ACPI_SUCCESS(status)) { found = true; break; } diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index 848718ab7312..7d3ddcba34ce 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -161,7 +161,7 @@ static ssize_t set_avg_interval(struct device *dev, mutex_lock(&resource->lock); status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PAI", &args, &data); - if (!ACPI_FAILURE(status)) + if (ACPI_SUCCESS(status)) resource->avg_interval = temp; mutex_unlock(&resource->lock); @@ -232,7 +232,7 @@ static ssize_t set_cap(struct device *dev, struct device_attribute *devattr, mutex_lock(&resource->lock); status = acpi_evaluate_integer(resource->acpi_dev->handle, "_SHL", &args, &data); - if (!ACPI_FAILURE(status)) + if (ACPI_SUCCESS(status)) resource->cap = temp; mutex_unlock(&resource->lock); diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 0edafe687fa9..bfea656e910c 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -861,7 +861,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr, * The significance of others is yet to be found. */ rv = acpi_evaluate_integer(asus->handle, "SFUN", NULL, &temp); - if (!ACPI_FAILURE(rv)) + if (ACPI_SUCCESS(rv)) len += sprintf(page + len, "SFUN value : %#x\n", (uint) temp); /* @@ -873,7 +873,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr, * takes several seconds to run on some systems. */ rv = acpi_evaluate_integer(asus->handle, "HWRS", NULL, &temp); - if (!ACPI_FAILURE(rv)) + if (ACPI_SUCCESS(rv)) len += sprintf(page + len, "HWRS value : %#x\n", (uint) temp); /* @@ -884,7 +884,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr, * silently ignored. */ rv = acpi_evaluate_integer(asus->handle, "ASYM", NULL, &temp); - if (!ACPI_FAILURE(rv)) + if (ACPI_SUCCESS(rv)) len += sprintf(page + len, "ASYM value : %#x\n", (uint) temp); if (asus->dsdt_info) { diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 720ab34784c1..801d8b499788 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2210,7 +2210,7 @@ static acpi_status acpi_register_spi_device(struct spi_controller *ctlr, return AE_OK; if (!lookup.max_speed_hz && - !ACPI_FAILURE(acpi_get_parent(adev->handle, &parent_handle)) && + ACPI_SUCCESS(acpi_get_parent(adev->handle, &parent_handle)) && ACPI_HANDLE(ctlr->dev.parent) == parent_handle) { /* Apple does not use _CRS but nested devices for SPI slaves */ acpi_spi_parse_apple_properties(adev, &lookup); diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 770ad25f1907..fe8049cd2765 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1444,7 +1444,7 @@ static bool atpx_present(void) dhandle = ACPI_HANDLE(&pdev->dev); if (dhandle) { status = acpi_get_handle(dhandle, "ATPX", &atpx_handle); - if (!ACPI_FAILURE(status)) { + if (ACPI_SUCCESS(status)) { pci_dev_put(pdev); return true; } @@ -1454,7 +1454,7 @@ static bool atpx_present(void) dhandle = ACPI_HANDLE(&pdev->dev); if (dhandle) { status = acpi_get_handle(dhandle, "ATPX", &atpx_handle); - if (!ACPI_FAILURE(status)) { + if (ACPI_SUCCESS(status)) { pci_dev_put(pdev); return true; }