Re: [PATCH v8 1/4] platform/x86: Sort firmware attributes class includes

On Wed, 22 Jul 2026, Sean Rhodes wrote:

> Move firmware_attributes_class.h into the main include block and sort the
> affected includes. This lets the header move replace each include in place.
> 
> Suggested-by: Derek J. Clark <[email protected]>
> Signed-off-by: Sean Rhodes <[email protected]>
> ---
>  drivers/platform/x86/asus-armoury.c                | 2 +-
>  drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 9 +++++----
>  drivers/platform/x86/hp/hp-bioscfg/bioscfg.c       | 9 +++++----
>  drivers/platform/x86/lenovo/think-lmi.c            | 5 +++--
>  drivers/platform/x86/lenovo/wmi-other.c            | 2 +-
>  drivers/platform/x86/samsung-galaxybook.c          | 3 ++-
>  6 files changed, 17 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/platform/x86/asus-armoury.c
> b/drivers/platform/x86/asus-armoury.c
> index 495dc1e31d40..f3d8c5a85762 100644
> --- a/drivers/platform/x86/asus-armoury.c
> +++ b/drivers/platform/x86/asus-armoury.c
> @@ -20,6 +20,7 @@
>  #include <linux/dmi.h>
>  #include <linux/err.h>
>  #include <linux/errno.h>
> +#include "firmware_attributes_class.h"
>  #include <linux/fs.h>
>  #include <linux/kernel.h>
>  #include <linux/kmod.h>
> @@ -34,7 +35,6 @@
>  #include <linux/sysfs.h>
> 
>  #include "asus-armoury.h"
> -#include "firmware_attributes_class.h"
> 
>  #define ASUS_NB_WMI_EVENT_GUID "0B3CBB35-E3C2-45ED-91C2-4C5A6D195D1C"
> 
> diff --git a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
> b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
> index ab46a023cc34..4ff9003c6589 100644
> --- a/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
> +++ b/drivers/platform/x86/dell/dell-wmi-sysman/sysman.c
> @@ -8,18 +8,19 @@
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> 
>  #include <linux/align.h>
> -#include <linux/fs.h>
>  #include <linux/dmi.h>
> -#include <linux/module.h>
> +#include "../../firmware_attributes_class.h"
> +#include <linux/fs.h>
>  #include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/nls.h>
>  #include <linux/string.h>
>  #include <linux/sysfs.h>
>  #include <linux/wmi.h>
> +
>  #include "dell-wmi-sysman.h"
> -#include "../../firmware_attributes_class.h"

I'm sorry I probably wasn't specific enough with my comment but the 
custom is to have the local includes separately in own block of includes 
(empty line in between).

Also, if there's a case where there is's linux/xx.h and 
someotherfolder/xx.h, those should be in own "blocks" of include, each 
group sorted alphabetically.

--
 i.

>  #define MAX_TYPES  4
> -#include <linux/nls.h>
> 
>  struct wmi_sysman_priv wmi_priv = {
>  	.mutex = __MUTEX_INITIALIZER(wmi_priv.mutex),
> diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
> b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
> index 27fd6cd21529..1965a329be48 100644
> --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
> +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
> @@ -7,16 +7,17 @@
> 
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> 
> +#include <linux/errno.h>
> +#include "../../firmware_attributes_class.h"
>  #include <linux/fs.h>
> -#include <linux/module.h>
>  #include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/nls.h>
>  #include <linux/printk.h>
>  #include <linux/string.h>
>  #include <linux/wmi.h>
> +
>  #include "bioscfg.h"
> -#include "../../firmware_attributes_class.h"
> -#include <linux/nls.h>
> -#include <linux/errno.h>
> 
>  MODULE_AUTHOR("Jorge Lopez <[email protected]>");
>  MODULE_DESCRIPTION("HP BIOS Configuration Driver");
> diff --git a/drivers/platform/x86/lenovo/think-lmi.c
> b/drivers/platform/x86/lenovo/think-lmi.c
> index e215e86e3db7..9e4b3e973de9 100644
> --- a/drivers/platform/x86/lenovo/think-lmi.c
> +++ b/drivers/platform/x86/lenovo/think-lmi.c
> @@ -13,14 +13,15 @@
> 
>  #include <linux/acpi.h>
>  #include <linux/array_size.h>
> +#include <linux/dmi.h>
>  #include <linux/errno.h>
> +#include "../firmware_attributes_class.h"
>  #include <linux/fs.h>
>  #include <linux/mutex.h>
>  #include <linux/string_helpers.h>
>  #include <linux/types.h>
> -#include <linux/dmi.h>
>  #include <linux/wmi.h>
> -#include "../firmware_attributes_class.h"
> +
>  #include "think-lmi.h"
> 
>  static bool debug_support;
> diff --git a/drivers/platform/x86/lenovo/wmi-other.c
> b/drivers/platform/x86/lenovo/wmi-other.c
> index fbb32bf404f2..fdebaa0a9992 100644
> --- a/drivers/platform/x86/lenovo/wmi-other.c
> +++ b/drivers/platform/x86/lenovo/wmi-other.c
> @@ -33,6 +33,7 @@
>  #include <linux/container_of.h>
>  #include <linux/device.h>
>  #include <linux/export.h>
> +#include "../firmware_attributes_class.h"
>  #include <linux/gfp_types.h>
>  #include <linux/hwmon.h>
>  #include <linux/idr.h>
> @@ -50,7 +51,6 @@
>  #include "wmi-capdata.h"
>  #include "wmi-events.h"
>  #include "wmi-helpers.h"
> -#include "../firmware_attributes_class.h"
> 
>  #define LENOVO_OTHER_MODE_GUID "DC2A8805-3A8C-41BA-A6F7-092E0089CD3B"
> 
> diff --git a/drivers/platform/x86/samsung-galaxybook.c
> b/drivers/platform/x86/samsung-galaxybook.c
> index 6382af0b106c..74103c00b0c8 100644
> --- a/drivers/platform/x86/samsung-galaxybook.c
> +++ b/drivers/platform/x86/samsung-galaxybook.c
> @@ -14,6 +14,7 @@
>  #include <linux/acpi.h>
>  #include <linux/bits.h>
>  #include <linux/err.h>
> +#include "firmware_attributes_class.h"
>  #include <linux/i8042.h>
>  #include <linux/init.h>
>  #include <linux/input.h>
> @@ -27,8 +28,8 @@
>  #include <linux/sysfs.h>
>  #include <linux/uuid.h>
>  #include <linux/workqueue.h>
> +
>  #include <acpi/battery.h>
> -#include "firmware_attributes_class.h"
> 
>  #define DRIVER_NAME "samsung-galaxybook"
> 
>