aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorGravatar Andy Shevchenko <andriy.shevchenko@linux.intel.com> 2024-03-25 14:33:00 +0200
committerGravatar Rafael J. Wysocki <rafael.j.wysocki@intel.com> 2024-04-04 21:19:02 +0200
commit2649a0f29a39f455ff39eb2296269e20df3bba0d (patch)
tree0ef78e7c25acd586526a60c46c7fe116974d4ba4 /drivers/acpi
parentACPI: bus: Don't use "proxy" headers (diff)
downloadlinux-2649a0f29a39f455ff39eb2296269e20df3bba0d.tar.gz
linux-2649a0f29a39f455ff39eb2296269e20df3bba0d.tar.bz2
linux-2649a0f29a39f455ff39eb2296269e20df3bba0d.zip
ACPI: scan: Use list_first_entry_or_null() in acpi_device_hid()
To replace list_empty() + list_first_entry() pair to simplify code. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7c157bf92695..dc625653b198 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1298,10 +1298,10 @@ const char *acpi_device_hid(struct acpi_device *device)
{
struct acpi_hardware_id *hid;
- if (list_empty(&device->pnp.ids))
+ hid = list_first_entry_or_null(&device->pnp.ids, struct acpi_hardware_id, list);
+ if (!hid)
return dummy_hid;
- hid = list_first_entry(&device->pnp.ids, struct acpi_hardware_id, list);
return hid->id;
}
EXPORT_SYMBOL(acpi_device_hid);