Skip to contentSkip to conversation

ACPI: fan: Initialize performance state sysfs attribute

PATCH Applied Guenter Roeck 2 participants 2 messages Nov 10, 2020 – Nov 16, 2020 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: fan: Initialize performance state sysfs attribute

The following warning is reported if lock debugging is enabled.

DEBUG_LOCKS_WARN_ON(1)

WARNING: CPU: 1 PID: 1 at kernel/locking/lockdep.c:4617 lockdep_init_map_waits+0x141/0x222
...
Call Trace:
 __kernfs_create_file+0x7a/0xd8
 sysfs_add_file_mode_ns+0x135/0x189
 sysfs_create_file_ns+0x70/0xa0
 acpi_fan_probe+0x547/0x621
 platform_drv_probe+0x67/0x8b
 ...

Dynamically allocated sysfs attributes need to be initialized to avoid the warning.

Fixes d19e470b6605 ("ACPI: fan: Expose fan performance state information")
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
---
 drivers/acpi/fan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/acpi/fan.c +1 -0
index 62873388b24f..9cbe58e394d0 100644
@@ -351,6 +351,7 @@ static int acpi_fan_get_fps(struct acpi_device *device)
 		struct acpi_fan_fps *fps = &fan->fps[i];
 
 		snprintf(fps->name, ACPI_FPS_NAME_LEN, "state%d", i);
+		sysfs_attr_init(&fps->dev_attr.attr);
 		fps->dev_attr.show = show_state;
 		fps->dev_attr.store = NULL;
 		fps->dev_attr.attr.name = fps->name;
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw
Quoted 30 lines · Guenter Roeck

The following warning is reported if lock debugging is enabled.

DEBUG_LOCKS_WARN_ON(1)

WARNING: CPU: 1 PID: 1 at kernel/locking/lockdep.c:4617 lockdep_init_map_waits+0x141/0x222
...
Call Trace:
 __kernfs_create_file+0x7a/0xd8
 sysfs_add_file_mode_ns+0x135/0x189
 sysfs_create_file_ns+0x70/0xa0
 acpi_fan_probe+0x547/0x621
 platform_drv_probe+0x67/0x8b
 ...

Dynamically allocated sysfs attributes need to be initialized to avoid the warning.

Fixes d19e470b6605 ("ACPI: fan: Expose fan performance state information")
Cc Srinivas Pandruvada <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
---
 drivers/acpi/fan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/acpi/fan.c +0 -0
index 62873388b24f..9cbe58e394d0 100644

drivers/acpi/fan.c static int acpi_fan_get_fps(struct acpi_device *device)

Quoted 8 lines
drivers/acpi/fan.c +1 -1
@@ -351,6 +351,7 @@ static int acpi_fan_get_fps(struct acpi_device *device)
                struct acpi_fan_fps *fps = &fan->fps[i];
 
                snprintf(fps->name, ACPI_FPS_NAME_LEN, "state%d", i);
+               sysfs_attr_init(&fps->dev_attr.attr);
                fps->dev_attr.show = show_state;
                fps->dev_attr.store = NULL;
                fps->dev_attr.attr.name = fps->name;
--

Applied as 5.11 material, thanks!