Re: [PATCH v1 4/5] ACPI: thermal: Move acpi_thermal_driver definition

[Wilczynski, Michal]

On 5/30/2023 5:44 PM, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>
> Move the definition of the acpi_thermal_driver structure closer to the
> initialization code that registes the driver, so some function forward

registe -> registers

I heard some people use 'codespell' for some automatic checking, but haven't
used that so far

> declarations can be dropped.
>
> Also move the module information to the end of the file where it is
> usually located.
>
> No functional impact.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> ---
>  drivers/acpi/thermal.c |   66 +++++++++++++++++++++++--------------------------
>  1 file changed, 31 insertions(+), 35 deletions(-)
>
> Index: linux-pm/drivers/acpi/thermal.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/thermal.c
> +++ linux-pm/drivers/acpi/thermal.c
> @@ -70,10 +70,6 @@ do { \
>  			"Please report to linux-acpi@xxxxxxxxxxxxxxx\n", str); \
>  } while (0)
>  
> -MODULE_AUTHOR("Paul Diefenbaugh");
> -MODULE_DESCRIPTION("ACPI Thermal Zone Driver");
> -MODULE_LICENSE("GPL");
> -
>  static int act;
>  module_param(act, int, 0644);
>  MODULE_PARM_DESC(act, "Disable or override all lowest active trip points.");
> @@ -100,37 +96,6 @@ MODULE_PARM_DESC(psv, "Disable or overri
>  
>  static struct workqueue_struct *acpi_thermal_pm_queue;
>  
> -static int acpi_thermal_add(struct acpi_device *device);
> -static void acpi_thermal_remove(struct acpi_device *device);
> -static void acpi_thermal_notify(struct acpi_device *device, u32 event);
> -
> -static const struct acpi_device_id  thermal_device_ids[] = {
> -	{ACPI_THERMAL_HID, 0},
> -	{"", 0},
> -};
> -MODULE_DEVICE_TABLE(acpi, thermal_device_ids);
> -
> -#ifdef CONFIG_PM_SLEEP
> -static int acpi_thermal_suspend(struct device *dev);
> -static int acpi_thermal_resume(struct device *dev);
> -#else
> -#define acpi_thermal_suspend NULL
> -#define acpi_thermal_resume NULL
> -#endif
> -static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, acpi_thermal_suspend, acpi_thermal_resume);
> -
> -static struct acpi_driver acpi_thermal_driver = {
> -	.name = "thermal",
> -	.class = ACPI_THERMAL_CLASS,
> -	.ids = thermal_device_ids,
> -	.ops = {
> -		.add = acpi_thermal_add,
> -		.remove = acpi_thermal_remove,
> -		.notify = acpi_thermal_notify,
> -		},
> -	.drv.pm = &acpi_thermal_pm,
> -};
> -
>  struct acpi_thermal_state {
>  	u8 critical:1;
>  	u8 hot:1;
> @@ -1131,6 +1096,33 @@ static int acpi_thermal_resume(struct de
>  }
>  #endif
>  
> +static const struct acpi_device_id  thermal_device_ids[] = {
> +	{ACPI_THERMAL_HID, 0},
> +	{"", 0},
> +};
> +MODULE_DEVICE_TABLE(acpi, thermal_device_ids);
> +
> +#ifdef CONFIG_PM_SLEEP
> +static int acpi_thermal_suspend(struct device *dev);
> +static int acpi_thermal_resume(struct device *dev);
> +#else
> +#define acpi_thermal_suspend	NULL
> +#define acpi_thermal_resume	NULL
> +#endif
> +static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, acpi_thermal_suspend, acpi_thermal_resume);
> +
> +static struct acpi_driver acpi_thermal_driver = {
> +	.name = "thermal",
> +	.class = ACPI_THERMAL_CLASS,
> +	.ids = thermal_device_ids,
> +	.ops = {
> +		.add = acpi_thermal_add,
> +		.remove = acpi_thermal_remove,
> +		.notify = acpi_thermal_notify,
> +		},
> +	.drv.pm = &acpi_thermal_pm,
> +};
> +
>  static int thermal_act(const struct dmi_system_id *d) {
>  	if (act == 0) {
>  		pr_notice("%s detected: disabling all active thermal trip points\n",
> @@ -1235,3 +1227,7 @@ static void __exit acpi_thermal_exit(voi
>  
>  module_init(acpi_thermal_init);
>  module_exit(acpi_thermal_exit);
> +
> +MODULE_AUTHOR("Paul Diefenbaugh");
> +MODULE_DESCRIPTION("ACPI Thermal Zone Driver");
> +MODULE_LICENSE("GPL");
>

Reviewed-by: Michal Wilczynski <michal.wilczynski@xxxxxxxxx>

>