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>

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7c157bf926956be5cabd6db7c708ff87759c7879..dc625653b19888e00f412a6ca0e209f134fa2d3f 100644 (file)
--- 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);