| Message ID | 20220917215622.342912-1-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | f23470e659964c41697e9c3e950fe80ecae143de |
| Headers | show |
| Series | ACPI: fan: Reorder symbols to get rid of a few forward declarations | expand |
On Sat, Sep 17, 2022 at 11:57 PM Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > Having the driver struct at the end of the file isn't only more usual, it > also allows to drop a few forward declarations which are just useless > repetition. > > While at it also move the MODULE_... macros to the end of the file. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- > drivers/acpi/fan_core.c | 58 +++++++++++++++++++---------------------- > 1 file changed, 27 insertions(+), 31 deletions(-) > > diff --git a/drivers/acpi/fan_core.c b/drivers/acpi/fan_core.c > index b9a9a59ddcc1..52a0b303b70a 100644 > --- a/drivers/acpi/fan_core.c > +++ b/drivers/acpi/fan_core.c > @@ -19,43 +19,12 @@ > > #include "fan.h" > > -MODULE_AUTHOR("Paul Diefenbaugh"); > -MODULE_DESCRIPTION("ACPI Fan Driver"); > -MODULE_LICENSE("GPL"); > - > -static int acpi_fan_probe(struct platform_device *pdev); > -static int acpi_fan_remove(struct platform_device *pdev); > - > static const struct acpi_device_id fan_device_ids[] = { > ACPI_FAN_DEVICE_IDS, > {"", 0}, > }; > MODULE_DEVICE_TABLE(acpi, fan_device_ids); > > -#ifdef CONFIG_PM_SLEEP > -static int acpi_fan_suspend(struct device *dev); > -static int acpi_fan_resume(struct device *dev); > -static const struct dev_pm_ops acpi_fan_pm = { > - .resume = acpi_fan_resume, > - .freeze = acpi_fan_suspend, > - .thaw = acpi_fan_resume, > - .restore = acpi_fan_resume, > -}; > -#define FAN_PM_OPS_PTR (&acpi_fan_pm) > -#else > -#define FAN_PM_OPS_PTR NULL > -#endif > - > -static struct platform_driver acpi_fan_driver = { > - .probe = acpi_fan_probe, > - .remove = acpi_fan_remove, > - .driver = { > - .name = "acpi-fan", > - .acpi_match_table = fan_device_ids, > - .pm = FAN_PM_OPS_PTR, > - }, > -}; > - > /* thermal cooling device callbacks */ > static int fan_get_max_state(struct thermal_cooling_device *cdev, unsigned long > *state) > @@ -459,6 +428,33 @@ static int acpi_fan_resume(struct device *dev) > > return result; > } > + > +static const struct dev_pm_ops acpi_fan_pm = { > + .resume = acpi_fan_resume, > + .freeze = acpi_fan_suspend, > + .thaw = acpi_fan_resume, > + .restore = acpi_fan_resume, > +}; > +#define FAN_PM_OPS_PTR (&acpi_fan_pm) > + > +#else > + > +#define FAN_PM_OPS_PTR NULL > + > #endif > > +static struct platform_driver acpi_fan_driver = { > + .probe = acpi_fan_probe, > + .remove = acpi_fan_remove, > + .driver = { > + .name = "acpi-fan", > + .acpi_match_table = fan_device_ids, > + .pm = FAN_PM_OPS_PTR, > + }, > +}; > + > module_platform_driver(acpi_fan_driver); > + > +MODULE_AUTHOR("Paul Diefenbaugh"); > +MODULE_DESCRIPTION("ACPI Fan Driver"); > +MODULE_LICENSE("GPL"); > -- Applied as 6.1 material, thanks!
diff --git a/drivers/acpi/fan_core.c b/drivers/acpi/fan_core.c index b9a9a59ddcc1..52a0b303b70a 100644 --- a/drivers/acpi/fan_core.c +++ b/drivers/acpi/fan_core.c @@ -19,43 +19,12 @@ #include "fan.h" -MODULE_AUTHOR("Paul Diefenbaugh"); -MODULE_DESCRIPTION("ACPI Fan Driver"); -MODULE_LICENSE("GPL"); - -static int acpi_fan_probe(struct platform_device *pdev); -static int acpi_fan_remove(struct platform_device *pdev); - static const struct acpi_device_id fan_device_ids[] = { ACPI_FAN_DEVICE_IDS, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, fan_device_ids); -#ifdef CONFIG_PM_SLEEP -static int acpi_fan_suspend(struct device *dev); -static int acpi_fan_resume(struct device *dev); -static const struct dev_pm_ops acpi_fan_pm = { - .resume = acpi_fan_resume, - .freeze = acpi_fan_suspend, - .thaw = acpi_fan_resume, - .restore = acpi_fan_resume, -}; -#define FAN_PM_OPS_PTR (&acpi_fan_pm) -#else -#define FAN_PM_OPS_PTR NULL -#endif - -static struct platform_driver acpi_fan_driver = { - .probe = acpi_fan_probe, - .remove = acpi_fan_remove, - .driver = { - .name = "acpi-fan", - .acpi_match_table = fan_device_ids, - .pm = FAN_PM_OPS_PTR, - }, -}; - /* thermal cooling device callbacks */ static int fan_get_max_state(struct thermal_cooling_device *cdev, unsigned long *state) @@ -459,6 +428,33 @@ static int acpi_fan_resume(struct device *dev) return result; } + +static const struct dev_pm_ops acpi_fan_pm = { + .resume = acpi_fan_resume, + .freeze = acpi_fan_suspend, + .thaw = acpi_fan_resume, + .restore = acpi_fan_resume, +}; +#define FAN_PM_OPS_PTR (&acpi_fan_pm) + +#else + +#define FAN_PM_OPS_PTR NULL + #endif +static struct platform_driver acpi_fan_driver = { + .probe = acpi_fan_probe, + .remove = acpi_fan_remove, + .driver = { + .name = "acpi-fan", + .acpi_match_table = fan_device_ids, + .pm = FAN_PM_OPS_PTR, + }, +}; + module_platform_driver(acpi_fan_driver); + +MODULE_AUTHOR("Paul Diefenbaugh"); +MODULE_DESCRIPTION("ACPI Fan Driver"); +MODULE_LICENSE("GPL");
Having the driver struct at the end of the file isn't only more usual, it also allows to drop a few forward declarations which are just useless repetition. While at it also move the MODULE_... macros to the end of the file. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/acpi/fan_core.c | 58 +++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-)