Commit 8c6fdbd6 authored by James Morse's avatar James Morse Committed by Rafael J. Wysocki
Browse files

ACPI: scan: Rename acpi_scan_device_not_present() to be about enumeration 



acpi_scan_device_not_present() is called when a device in the
hierarchy is not available for enumeration. Historically enumeration
was only based on whether the device was present.

To add support for only enumerating devices that are both present
and enabled, this helper should be renamed. It was only ever about
enumeration, rename it acpi_scan_device_not_enumerated().

No change in behaviour is intended.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Reviewed-by: default avatarGavin Shan <gshan@redhat.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarMiguel Luis <miguel.luis@oracle.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b5bdb60f

drivers/acpi/scan.c

+4 −4
Original line number Diff line number Diff line
@@ -289,10 +289,10 @@ static int acpi_scan_hot_remove(struct acpi_device *device) 
	return 0;

}



static int acpi_scan_device_not_present(struct acpi_device *adev)

static int acpi_scan_device_not_enumerated(struct acpi_device *adev)

{

	if (!acpi_device_enumerated(adev)) {

		dev_warn(&adev->dev, "Still not present\n");

		dev_warn(&adev->dev, "Still not enumerated\n");

		return -EALREADY;

	}

	acpi_bus_trim(adev);
@@ -327,7 +327,7 @@ static int acpi_scan_device_check(struct acpi_device *adev) 
			error = -ENODEV;

		}

	} else {

		error = acpi_scan_device_not_present(adev);

		error = acpi_scan_device_not_enumerated(adev);

	}

	return error;

}
@@ -339,7 +339,7 @@ static int acpi_scan_bus_check(struct acpi_device *adev, void *not_used) 


	acpi_bus_get_status(adev);

	if (!acpi_device_is_present(adev)) {

		acpi_scan_device_not_present(adev);

		acpi_scan_device_not_enumerated(adev);

		return 0;

	}

	if (handler && handler->hotplug.scan_dependent)