[PATCH v3 4/6] drivers: Reorder headers alphabetically

From: Ahmed S. Darwish
Date: Tue Jul 22 2025 - 02:56:16 EST

Next message: Ahmed S. Darwish: "[PATCH v3 5/6] treewide: Explicitly include the x86 CPUID headers"
Previous message: Ahmed S. Darwish: "[PATCH v3 3/6] x86: Reorder headers alphabetically"
In reply to: Sean Christopherson: "Re: [PATCH v3 3/6] x86: Reorder headers alphabetically"
Next in thread: Ahmed S. Darwish: "[PATCH v3 5/6] treewide: Explicitly include the x86 CPUID headers"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Multiple drivers use the cpuid_*() macros, but implicitly include the
main CPUID API header.

Sort their include lines so that <asm/cpuid/api.h> can be explicitly
included next.

Signed-off-by: Ahmed S. Darwish <darwi@xxxxxxxxxxxxx>
---
drivers/char/agp/efficeon-agp.c | 9 ++++---
drivers/cpufreq/longrun.c | 6 ++---
drivers/cpufreq/powernow-k7.c | 13 +++++----
drivers/cpufreq/powernow-k8.c | 16 +++++------
drivers/cpufreq/speedstep-lib.c | 5 ++--
drivers/hwmon/fam15h_power.c | 13 ++++-----
drivers/hwmon/k8temp.c | 11 ++++----
.../net/ethernet/stmicro/stmmac/dwmac-intel.c | 3 ++-
drivers/ras/amd/fmpm.c | 2 +-
drivers/thermal/intel/x86_pkg_temp_thermal.c | 14 +++++-----
drivers/xen/events/events_base.c | 27 ++++++++++---------
drivers/xen/grant-table.c | 14 +++++-----
drivers/xen/xenbus/xenbus_xs.c | 20 +++++++-------
13 files changed, 80 insertions(+), 73 deletions(-)

diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c
index 0d25bbdc7e6a..79f956d7b17d 100644
--- a/drivers/char/agp/efficeon-agp.c
+++ b/drivers/char/agp/efficeon-agp.c
@@ -20,13 +20,14 @@
* - tested with c3/c4 enabled (with the mobility m9 card)
*/

-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/init.h>
#include <linux/agp_backend.h>
#include <linux/gfp.h>
-#include <linux/page-flags.h>
+#include <linux/init.h>
#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/page-flags.h>
+#include <linux/pci.h>
+
#include "agp.h"
#include "intel-agp.h"

diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c
index 1caaec7c280b..263c48b8f628 100644
--- a/drivers/cpufreq/longrun.c
+++ b/drivers/cpufreq/longrun.c
@@ -5,15 +5,15 @@
* BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
*/

+#include <linux/cpufreq.h>
+#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
#include <linux/timex.h>

+#include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include <asm/processor.h>
-#include <asm/cpu_device_id.h>

static struct cpufreq_driver longrun_driver;

diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index 31039330a3ba..0608040fcd1e 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -15,20 +15,20 @@

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/cpufreq.h>
+#include <linux/dmi.h>
+#include <linux/init.h>
+#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
#include <linux/slab.h>
#include <linux/string.h>
-#include <linux/dmi.h>
#include <linux/timex.h>
-#include <linux/io.h>

-#include <asm/timer.h> /* Needed for recalibrate_cpu_khz() */
-#include <asm/msr.h>
#include <asm/cpu_device_id.h>
+#include <asm/msr.h>
+#include <asm/timer.h> /* Needed for recalibrate_cpu_khz() */

#ifdef CONFIG_X86_POWERNOW_K7_ACPI
#include <linux/acpi.h>
@@ -691,4 +691,3 @@ MODULE_LICENSE("GPL");

late_initcall(powernow_init);
module_exit(powernow_exit);
-
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index f7512b4e923e..2b5cdd8f1c0a 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -26,22 +26,22 @@

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/acpi.h>
+#include <linux/cpufreq.h>
+#include <linux/cpumask.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/io.h>
#include <linux/kernel.h>
-#include <linux/smp.h>
#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
+#include <linux/mutex.h>
#include <linux/slab.h>
+#include <linux/smp.h>
#include <linux/string.h>
-#include <linux/cpumask.h>
-#include <linux/io.h>
-#include <linux/delay.h>

#include <asm/msr.h>
#include <asm/cpu_device_id.h>

-#include <linux/acpi.h>
-#include <linux/mutex.h>
#include <acpi/processor.h>

#define VERSION "version 2.20.00"
diff --git a/drivers/cpufreq/speedstep-lib.c b/drivers/cpufreq/speedstep-lib.c
index 0b66df4ed513..f08817331aec 100644
--- a/drivers/cpufreq/speedstep-lib.c
+++ b/drivers/cpufreq/speedstep-lib.c
@@ -9,14 +9,15 @@

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/cpufreq.h>
+#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>

#include <asm/msr.h>
#include <asm/tsc.h>
+
#include "speedstep-lib.h"

#define PFX "speedstep-lib: "
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 8ecebea53651..5a5674e85f63 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -6,20 +6,21 @@
* Author: Andreas Herrmann <herrmann.der.user@xxxxxxxxxxxxxx>
*/

+#include <linux/bitops.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
#include <linux/err.h>
-#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/bitops.h>
-#include <linux/cpu.h>
-#include <linux/cpumask.h>
-#include <linux/time.h>
#include <linux/sched.h>
+#include <linux/time.h>
#include <linux/topology.h>
-#include <asm/processor.h>
+
#include <asm/msr.h>
+#include <asm/processor.h>

MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");
MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@xxxxxxxxxxxxxx>");
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c
index 2b80ac410cd1..8c1efce9a04b 100644
--- a/drivers/hwmon/k8temp.c
+++ b/drivers/hwmon/k8temp.c
@@ -7,13 +7,14 @@
* Inspired from the w83785 and amd756 drivers.
*/

-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/pci.h>
-#include <linux/hwmon.h>
#include <linux/err.h>
+#include <linux/hwmon.h>
+#include <linux/init.h>
+#include <linux/module.h>
#include <linux/mutex.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+
#include <asm/processor.h>

#define TEMP_FROM_REG(val) (((((val) >> 16) & 0xff) - 49) * 1000)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index ea33ae39be6b..444ee53566c4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -3,9 +3,10 @@
*/

#include <linux/clk-provider.h>
-#include <linux/pci.h>
#include <linux/dmi.h>
+#include <linux/pci.h>
#include <linux/platform_data/x86/intel_pmc_ipc.h>
+
#include "dwmac-intel.h"
#include "dwmac4.h"
#include "stmmac.h"
diff --git a/drivers/ras/amd/fmpm.c b/drivers/ras/amd/fmpm.c
index 8877c6ff64c4..775c5231be57 100644
--- a/drivers/ras/amd/fmpm.c
+++ b/drivers/ras/amd/fmpm.c
@@ -46,8 +46,8 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/cper.h>
-#include <linux/ras.h>
#include <linux/cpu.h>
+#include <linux/ras.h>

#include <acpi/apei.h>

diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c
index 3fc679b6f11b..c843cb5fc5c3 100644
--- a/drivers/thermal/intel/x86_pkg_temp_thermal.c
+++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c
@@ -5,19 +5,19 @@
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

-#include <linux/module.h>
+#include <linux/cpu.h>
+#include <linux/debugfs.h>
+#include <linux/device.h>
+#include <linux/err.h>
#include <linux/init.h>
#include <linux/intel_tcc.h>
-#include <linux/err.h>
+#include <linux/module.h>
#include <linux/param.h>
-#include <linux/device.h>
#include <linux/platform_device.h>
-#include <linux/cpu.h>
-#include <linux/smp.h>
-#include <linux/slab.h>
#include <linux/pm.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
#include <linux/thermal.h>
-#include <linux/debugfs.h>

#include <asm/cpu_device_id.h>
#include <asm/msr.h>
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index 41309d38f78c..727a78bfdf02 100644
--- a/drivers/xen/events/events_base.c
+++ b/drivers/xen/events/events_base.c
@@ -24,40 +24,42 @@

#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt

-#include <linux/linkage.h>
+#include <linux/atomic.h>
+#include <linux/cpuhotplug.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
-#include <linux/moduleparam.h>
-#include <linux/string.h>
-#include <linux/memblock.h>
-#include <linux/slab.h>
#include <linux/irqnr.h>
+#include <linux/ktime.h>
+#include <linux/linkage.h>
+#include <linux/memblock.h>
+#include <linux/moduleparam.h>
#include <linux/pci.h>
#include <linux/rcupdate.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
-#include <linux/cpuhotplug.h>
-#include <linux/atomic.h>
-#include <linux/ktime.h>
+#include <linux/string.h>

#ifdef CONFIG_X86
#include <asm/desc.h>
-#include <asm/ptrace.h>
+#include <asm/i8259.h>
#include <asm/idtentry.h>
-#include <asm/irq.h>
#include <asm/io_apic.h>
-#include <asm/i8259.h>
+#include <asm/irq.h>
+#include <asm/ptrace.h>
#include <asm/xen/cpuid.h>
#include <asm/xen/pci.h>
#endif
+
+#include <asm/hw_irq.h>
#include <asm/sync_bitops.h>
#include <asm/xen/hypercall.h>
#include <asm/xen/hypervisor.h>
-#include <xen/page.h>

#include <xen/xen.h>
#include <xen/hvm.h>
#include <xen/xen-ops.h>
#include <xen/events.h>
+#include <xen/page.h>
#include <xen/interface/xen.h>
#include <xen/interface/event_channel.h>
#include <xen/interface/hvm/hvm_op.h>
@@ -66,7 +68,6 @@
#include <xen/interface/sched.h>
#include <xen/interface/vcpu.h>
#include <xen/xenbus.h>
-#include <asm/hw_irq.h>

#include "events_internal.h"

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 04a6b470b15d..a9ff69f08eb8 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -34,18 +34,18 @@
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt

#include <linux/bitmap.h>
+#include <linux/delay.h>
+#include <linux/hardirq.h>
+#include <linux/io.h>
#include <linux/memblock.h>
-#include <linux/sched.h>
#include <linux/mm.h>
+#include <linux/moduleparam.h>
+#include <linux/ratelimit.h>
+#include <linux/sched.h>
#include <linux/slab.h>
-#include <linux/vmalloc.h>
#include <linux/uaccess.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/hardirq.h>
+#include <linux/vmalloc.h>
#include <linux/workqueue.h>
-#include <linux/ratelimit.h>
-#include <linux/moduleparam.h>
#ifdef CONFIG_XEN_GRANT_DMA_ALLOC
#include <linux/dma-mapping.h>
#endif
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c
index dcf9182c8451..589585b05f8a 100644
--- a/drivers/xen/xenbus/xenbus_xs.c
+++ b/drivers/xen/xenbus/xenbus_xs.c
@@ -33,22 +33,24 @@

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

-#include <linux/unistd.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/uio.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
#include <linux/err.h>
-#include <linux/slab.h>
+#include <linux/errno.h>
#include <linux/fcntl.h>
+#include <linux/kernel.h>
#include <linux/kthread.h>
+#include <linux/mutex.h>
#include <linux/reboot.h>
#include <linux/rwsem.h>
-#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/uio.h>
+#include <linux/unistd.h>
+
#include <asm/xen/hypervisor.h>
-#include <xen/xenbus.h>
+
#include <xen/xen.h>
+#include <xen/xenbus.h>
#include "xenbus.h"

/*
--
2.50.1

Next message: Ahmed S. Darwish: "[PATCH v3 5/6] treewide: Explicitly include the x86 CPUID headers"
Previous message: Ahmed S. Darwish: "[PATCH v3 3/6] x86: Reorder headers alphabetically"
In reply to: Sean Christopherson: "Re: [PATCH v3 3/6] x86: Reorder headers alphabetically"
Next in thread: Ahmed S. Darwish: "[PATCH v3 5/6] treewide: Explicitly include the x86 CPUID headers"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]