2023-10-20 13:59:58

by Russell King (Oracle)

Subject: [PATCH] ACPI: Use the acpi_device_is_present() helper in more places

From: James Morse <[email protected]>

acpi_device_is_present() checks the present or functional bits
from the cached copy of _STA.

A few places open-code this check. Use the helper instead to
improve readability.

Signed-off-by: James Morse <[email protected]>
Reviewed-by: Jonathan Cameron <[email protected]>
Reviewed-by: Gavin Shan <[email protected]>
Signed-off-by: Russell King (Oracle) <[email protected]>
---
Jonathan Cameron suggests "Pull this one out and send it upstream in
advance of the rest" so let's do that. See
https://lore.kernel.org/r/[email protected]/

So, let's get this upstream to reduce the number of outstanding patches
for aarch64 vcpu hotplug.

drivers/acpi/scan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 691d4b7686ee..ed01e19514ef 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -304,7 +304,7 @@ static int acpi_scan_device_check(struct acpi_device *adev)
int error;

acpi_bus_get_status(adev);
- if (adev->status.present || adev->status.functional) {
+ if (acpi_device_is_present(adev)) {
/*
* This function is only called for device objects for which
* matching scan handlers exist. The only situation in which
@@ -338,7 +338,7 @@ static int acpi_scan_bus_check(struct acpi_device *adev, void *not_used)
int error;

acpi_bus_get_status(adev);
- if (!(adev->status.present || adev->status.functional)) {
+ if (!acpi_device_is_present(adev)) {
acpi_scan_device_not_present(adev);
return 0;
}
--
2.30.2

2023-10-20 14:52:56

by Miguel Luis

Subject: Re: [PATCH] ACPI: Use the acpi_device_is_present() helper in more places

Hi Russell,

> On 20 Oct 2023, at 13:59, Russell King <[email protected]> wrote:
>
> From: James Morse <[email protected]>
>
> acpi_device_is_present() checks the present or functional bits
> from the cached copy of _STA.
>
> A few places open-code this check. Use the helper instead to
> improve readability.
>
> Signed-off-by: James Morse <[email protected]>
> Reviewed-by: Jonathan Cameron <[email protected]>
> Reviewed-by: Gavin Shan <[email protected]>
> Signed-off-by: Russell King (Oracle) <[email protected]>
> ---
> Jonathan Cameron suggests "Pull this one out and send it upstream in
> advance of the rest" so let's do that. See
> https://lore.kernel.org/r/[email protected]/
>
> So, let's get this upstream to reduce the number of outstanding patches
> for aarch64 vcpu hotplug.
>
> drivers/acpi/scan.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 691d4b7686ee..ed01e19514ef 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -304,7 +304,7 @@ static int acpi_scan_device_check(struct acpi_device *adev)
> int error;
>
> acpi_bus_get_status(adev);
> - if (adev->status.present || adev->status.functional) {
> + if (acpi_device_is_present(adev)) {
> /*
> * This function is only called for device objects for which
> * matching scan handlers exist. The only situation in which
> @@ -338,7 +338,7 @@ static int acpi_scan_bus_check(struct acpi_device *adev, void *not_used)
> int error;
>
> acpi_bus_get_status(adev);
> - if (!(adev->status.present || adev->status.functional)) {
> + if (!acpi_device_is_present(adev)) {

Reviewed-by: Miguel Luis <[email protected]>

Thank you

Miguel

> acpi_scan_device_not_present(adev);
> return 0;
> }
> --
> 2.30.2
>
>

2023-10-20 16:52:19

by Rafael J. Wysocki

Subject: Re: [PATCH] ACPI: Use the acpi_device_is_present() helper in more places

On Fri, Oct 20, 2023 at 4:52 PM Miguel Luis <[email protected]> wrote:
>
> Hi Russell,
>
> > On 20 Oct 2023, at 13:59, Russell King <[email protected]> wrote:
> >
> > From: James Morse <[email protected]>
> >
> > acpi_device_is_present() checks the present or functional bits
> > from the cached copy of _STA.
> >
> > A few places open-code this check. Use the helper instead to
> > improve readability.
> >
> > Signed-off-by: James Morse <[email protected]>
> > Reviewed-by: Jonathan Cameron <[email protected]>
> > Reviewed-by: Gavin Shan <[email protected]>
> > Signed-off-by: Russell King (Oracle) <[email protected]>
> > ---
> > Jonathan Cameron suggests "Pull this one out and send it upstream in
> > advance of the rest" so let's do that. See
> > https://lore.kernel.org/r/[email protected]/
> >
> > So, let's get this upstream to reduce the number of outstanding patches
> > for aarch64 vcpu hotplug.
> >
> > drivers/acpi/scan.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> > index 691d4b7686ee..ed01e19514ef 100644
> > --- a/drivers/acpi/scan.c
> > +++ b/drivers/acpi/scan.c
> > @@ -304,7 +304,7 @@ static int acpi_scan_device_check(struct acpi_device *adev)
> > int error;
> >
> > acpi_bus_get_status(adev);
> > - if (adev->status.present || adev->status.functional) {
> > + if (acpi_device_is_present(adev)) {
> > /*
> > * This function is only called for device objects for which
> > * matching scan handlers exist. The only situation in which
> > @@ -338,7 +338,7 @@ static int acpi_scan_bus_check(struct acpi_device *adev, void *not_used)
> > int error;
> >
> > acpi_bus_get_status(adev);
> > - if (!(adev->status.present || adev->status.functional)) {
> > + if (!acpi_device_is_present(adev)) {
>
> Reviewed-by: Miguel Luis <[email protected]>

Applied as 6.7 material, thanks!