ACPI: scan: Use the acpi_device_is_present() helper in more places

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 <james.morse@arm.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Miguel Luis <miguel.luis@oracle.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 691d4b7686ee7eb40d03ba6b81263a2dc51c8838..ed01e19514efe6813070f314b9e32b1f5d992c21 100644 (file)
--- 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;
        }