ACPI: scan: Use list_first_entry_or_null() in acpi_device_hid()

andy-shev · rafaeljw · commit 2649a0f29a39 · 2024-04-04T21:19:02.000+02:00
To replace list_empty() + list_first_entry() pair to simplify code.

Signed-off-by: Andy Shevchenko &lt;andriy.shevchenko@linux.intel.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1298,10 +1298,10 @@ const char acpi_device_hid(struct acpi_device device)`
`1298`	`1298`	`{`
`1299`	`1299`	`struct acpi_hardware_id *hid;`
`1300`	`1300`
`1301`		`- if (list_empty(&device->pnp.ids))`
	`1301`	`+ hid = list_first_entry_or_null(&device->pnp.ids, struct acpi_hardware_id, list);`
	`1302`	`+ if (!hid)`
`1302`	`1303`	`return dummy_hid;`
`1303`	`1304`
`1304`		`- hid = list_first_entry(&device->pnp.ids, struct acpi_hardware_id, list);`
`1305`	`1305`	`return hid->id;`
`1306`	`1306`	`}`
`1307`	`1307`	`EXPORT_SYMBOL(acpi_device_hid);`