Skip to content

Commit

Permalink
ACPI / x86: utils: Remove status workaround from acpi_device_always_p…
Browse files Browse the repository at this point in the history
…resent()

Now that we init the status field to ACPI_STA_DEFAULT rather then to 0,
the workaround for acpi_match_device_ids() always returning -ENOENT when
status is 0 is no longer needed.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Hans de Goede authored and Rafael J. Wysocki committed Aug 9, 2018
1 parent d0ed4c6 commit 21ba074
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions drivers/acpi/x86/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,9 @@ static const struct always_present_id always_present_ids[] = {

bool acpi_device_always_present(struct acpi_device *adev)
{
u32 *status = (u32 *)&adev->status;
u32 old_status = *status;
bool ret = false;
unsigned int i;

/* acpi_match_device_ids checks status, so set it to default */
*status = ACPI_STA_DEFAULT;
for (i = 0; i < ARRAY_SIZE(always_present_ids); i++) {
if (acpi_match_device_ids(adev, always_present_ids[i].hid))
continue;
Expand All @@ -131,15 +127,9 @@ bool acpi_device_always_present(struct acpi_device *adev)
!dmi_check_system(always_present_ids[i].dmi_ids))
continue;

if (old_status != ACPI_STA_DEFAULT) /* Log only once */
dev_info(&adev->dev,
"Device [%s] is in always present list\n",
adev->pnp.bus_id);

ret = true;
break;
}
*status = old_status;

return ret;
}

0 comments on commit 21ba074

Please sign in to comment.