Merge branch 'acpi-sysfs'

* acpi-sysfs: ACPI: sysfs: Prefer "compatible" modalias

Merge branch 'acpi-sysfs'
* acpi-sysfs: ACPI: sysfs: Prefer "compatible" modalias
b584b7e9 · Rafael J. Wysocki · 81b704d3 · 36af2d5c · b584b7e9
Commit b584b7e9 authored Jan 29, 2021 by Rafael J. Wysocki
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 14 deletions

drivers/acpi/device_sysfs.c drivers/acpi/device_sysfs.c +6 -14

No files found.
--- a/drivers/acpi/device_sysfs.c
+++ b/drivers/acpi/device_sysfs.c
@@ -251,20 +251,12 @@ int __acpi_device_uevent_modalias(struct acpi_device *adev,
 	if (add_uevent_var(env, "MODALIAS="))
 		return -ENOMEM;
-	len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],
+	if (adev->data.of_compatible)
-				  sizeof(env->buf) - env->buflen);
+		len = create_of_modalias(adev, &env->buf[env->buflen - 1],
-	if (len < 0)
+					 sizeof(env->buf) - env->buflen);
-		return len;
+	else
+		len = create_pnp_modalias(adev, &env->buf[env->buflen - 1],
-	env->buflen += len;
+					  sizeof(env->buf) - env->buflen);
-	if (!adev->data.of_compatible)
-		return 0;
-	if (len > 0 && add_uevent_var(env, "MODALIAS="))
-		return -ENOMEM;
-	len = create_of_modalias(adev, &env->buf[env->buflen - 1],
-				 sizeof(env->buf) - env->buflen);
 	if (len < 0)
 		return len;