Skip to contentSkip to conversation

ACPI: fan: Ad-hoc cleanups

PATCH Applied Andy Shevchenko 3 participants 5 messages Jul 17 – Jul 21 ACPI

lore
Share & tools
lore
#0 lore raw

cover ACPI: fan: Ad-hoc cleanups

The main purpose of my work is to clean up always included linux/kconfig.h. But there is room to improve the drivers/acpi/fan.h. Hence this small series.

Andy Shevchenko (2):
ACPI: fan: Don't use "proxy" headers
ACPI: fan: Update ACPI fan IDs to follow modern style

 drivers/acpi/fan.h | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
Signature · 1 line
2.50.1
#1 lore raw

PATCH 1/2 ACPI: fan: Don't use "proxy" headers

Update header inclusions to follow IWYU (Include What You Use) principle.

---
 drivers/acpi/fan.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/acpi/fan.h +2 -1
index 97ce3212edf3..e06c055a8bb6 100644
@@ -10,8 +10,9 @@
 #ifndef _ACPI_FAN_H_
 #define _ACPI_FAN_H_
 
-#include <linux/kconfig.h>
+#include <linux/device.h>
 #include <linux/limits.h>
+#include <linux/types.h>
 
 #define ACPI_FAN_DEVICE_IDS	\
 	{"INT3404", }, /* Fan */ \
Signature · 1 line
2.50.1
#2 lore raw

PATCH 2/2 ACPI: fan: Update ACPI fan IDs to follow modern style

In reply to Andy Shevchenko

Follow modern style of defining ACPI IDs by using C99 initialisers. This is a missing part to bigger rework that's ongoing in the kernel.

---
 drivers/acpi/fan.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/acpi/fan.h +11 -11
index e06c055a8bb6..822c5455e43b 100644
@@ -14,17 +14,17 @@
 #include <linux/limits.h>
 #include <linux/types.h>
 
-#define ACPI_FAN_DEVICE_IDS	\
-	{"INT3404", }, /* Fan */ \
-	{"INTC1044", }, /* Fan for Tiger Lake generation */ \
-	{"INTC1048", }, /* Fan for Alder Lake generation */ \
-	{"INTC1063", }, /* Fan for Meteor Lake generation */ \
-	{"INTC106A", }, /* Fan for Lunar Lake generation */ \
-	{"INTC10A2", }, /* Fan for Raptor Lake generation */ \
-	{"INTC10D6", }, /* Fan for Panther Lake generation */ \
-	{"INTC10FE", }, /* Fan for Wildcat Lake generation */ \
-	{"INTC10F5", }, /* Fan for Nova Lake generation */ \
-	{"PNP0C0B", } /* Generic ACPI fan */
+#define ACPI_FAN_DEVICE_IDS						\
+	{ .id = "INT3404" },	/* Fan */				\
+	{ .id = "INTC1044" },	/* Fan for Tiger Lake generation */	\
+	{ .id = "INTC1048" },	/* Fan for Alder Lake generation */	\
+	{ .id = "INTC1063" },	/* Fan for Meteor Lake generation */	\
+	{ .id = "INTC106A" },	/* Fan for Lunar Lake generation */	\
+	{ .id = "INTC10A2" },	/* Fan for Raptor Lake generation */	\
+	{ .id = "INTC10D6" },	/* Fan for Panther Lake generation */	\
+	{ .id = "INTC10FE" },	/* Fan for Wildcat Lake generation */	\
+	{ .id = "INTC10F5" },	/* Fan for Nova Lake generation */	\
+	{ .id = "PNP0C0B" }	/* Generic ACPI fan */
 
 #define ACPI_FPS_NAME_LEN	20
 
Signature · 1 line
2.50.1
Reviewed-by on the v1 series
#3 lore raw
In reply to Andy Shevchenko

Am 17.07.26 um 19:08 schrieb Andy Shevchenko:

Quoted 2 lines

The main purpose of my work is to clean up always included linux/kconfig.h. But there is room to improve the drivers/acpi/fan.h. Hence this small series.

Quoted 8 lines

Andy Shevchenko (2):
ACPI: fan: Don't use "proxy" headers
ACPI: fan: Update ACPI fan IDs to follow modern style

  drivers/acpi/fan.h | 25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)
maintainer Applied
#4 lore raw
Quoted 15 lines · Armin Wolf

Am 17.07.26 um 19:08 schrieb Andy Shevchenko:

Quoted 2 lines

The main purpose of my work is to clean up always included linux/kconfig.h. But there is room to improve the drivers/acpi/fan.h. Hence this small series.

Quoted 7 lines

Andy Shevchenko (2):
ACPI: fan: Don't use "proxy" headers
ACPI: fan: Update ACPI fan IDs to follow modern style

  drivers/acpi/fan.h | 25 +++++++++++++------------
  1 file changed, 13 insertions(+), 12 deletions(-)

Applied as 7.3 material, thanks!