Skip to content

Commit 8c6fdbd

Browse files
James Morserafaeljw
authored andcommitted
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: James Morse <[email protected]> Reviewed-by: Gavin Shan <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]> Reviewed-by: Miguel Luis <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent b5bdb60 commit 8c6fdbd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/acpi/scan.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,10 @@ static int acpi_scan_hot_remove(struct acpi_device *device)
289289
return 0;
290290
}
291291

292-
static int acpi_scan_device_not_present(struct acpi_device *adev)
292+
static int acpi_scan_device_not_enumerated(struct acpi_device *adev)
293293
{
294294
if (!acpi_device_enumerated(adev)) {
295-
dev_warn(&adev->dev, "Still not present\n");
295+
dev_warn(&adev->dev, "Still not enumerated\n");
296296
return -EALREADY;
297297
}
298298
acpi_bus_trim(adev);
@@ -327,7 +327,7 @@ static int acpi_scan_device_check(struct acpi_device *adev)
327327
error = -ENODEV;
328328
}
329329
} else {
330-
error = acpi_scan_device_not_present(adev);
330+
error = acpi_scan_device_not_enumerated(adev);
331331
}
332332
return error;
333333
}
@@ -339,7 +339,7 @@ static int acpi_scan_bus_check(struct acpi_device *adev, void *not_used)
339339

340340
acpi_bus_get_status(adev);
341341
if (!acpi_device_is_present(adev)) {
342-
acpi_scan_device_not_present(adev);
342+
acpi_scan_device_not_enumerated(adev);
343343
return 0;
344344
}
345345
if (handler && handler->hotplug.scan_dependent)

0 commit comments

Comments
 (0)