Commit cde1f95f authored by Sakari Ailus's avatar Sakari Ailus Committed by Rafael J. Wysocki

ACPI: Constify argument to acpi_device_is_present()

This will be needed in constifying the fwnode API.

The side effects the function had have been moved to the callers.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 2b815342
...@@ -261,8 +261,10 @@ int acpi_bus_init_power(struct acpi_device *device) ...@@ -261,8 +261,10 @@ int acpi_bus_init_power(struct acpi_device *device)
return -EINVAL; return -EINVAL;
device->power.state = ACPI_STATE_UNKNOWN; device->power.state = ACPI_STATE_UNKNOWN;
if (!acpi_device_is_present(device)) if (!acpi_device_is_present(device)) {
device->flags.initialized = false;
return -ENXIO; return -ENXIO;
}
result = acpi_device_get_power(device, &state); result = acpi_device_get_power(device, &state);
if (result) if (result)
......
...@@ -111,7 +111,7 @@ int acpi_device_setup_files(struct acpi_device *dev); ...@@ -111,7 +111,7 @@ int acpi_device_setup_files(struct acpi_device *dev);
void acpi_device_remove_files(struct acpi_device *dev); void acpi_device_remove_files(struct acpi_device *dev);
void acpi_device_add_finalize(struct acpi_device *device); void acpi_device_add_finalize(struct acpi_device *device);
void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); void acpi_free_pnp_ids(struct acpi_device_pnp *pnp);
bool acpi_device_is_present(struct acpi_device *adev); bool acpi_device_is_present(const struct acpi_device *adev);
bool acpi_device_is_battery(struct acpi_device *adev); bool acpi_device_is_battery(struct acpi_device *adev);
bool acpi_device_is_first_physical_node(struct acpi_device *adev, bool acpi_device_is_first_physical_node(struct acpi_device *adev,
const struct device *dev); const struct device *dev);
......
...@@ -1567,13 +1567,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type, ...@@ -1567,13 +1567,9 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
return 0; return 0;
} }
bool acpi_device_is_present(struct acpi_device *adev) bool acpi_device_is_present(const struct acpi_device *adev)
{ {
if (adev->status.present || adev->status.functional) return adev->status.present || adev->status.functional;
return true;
adev->flags.initialized = false;
return false;
} }
static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler, static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
...@@ -1831,6 +1827,7 @@ static void acpi_bus_attach(struct acpi_device *device) ...@@ -1831,6 +1827,7 @@ static void acpi_bus_attach(struct acpi_device *device)
acpi_bus_get_status(device); acpi_bus_get_status(device);
/* Skip devices that are not present. */ /* Skip devices that are not present. */
if (!acpi_device_is_present(device)) { if (!acpi_device_is_present(device)) {
device->flags.initialized = false;
acpi_device_clear_enumerated(device); acpi_device_clear_enumerated(device);
device->flags.power_manageable = 0; device->flags.power_manageable = 0;
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment