ACPI / thermal: fix trivial compilation error
Subsystems (2)
PATCH 1/1 ACPI / thermal: fix trivial compilation error
Previous patch didn't move callback function definitions before usage, thus we end up with ea compilation error. This patch fixes it.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/acpi/thermal.c | 73 ++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 35 deletions(-)
drivers/acpi/thermal.c +38 -35
@@ -978,6 +978,44 @@ static void acpi_thermal_notify(struct acpi_device *device, u32 event) } } +static int thermal_act (const struct dmi_system_id *d) { + +if (act ==0 ) { +pr_notice (PREFIX "%s detected: " +"disabling all active thermal trip points\n" , d->ident); + act =-1 ; + } +return 0 ; +} + +static int thermal_nocrt (const struct dmi_system_id *d) { + +pr_notice (PREFIX "%s detected: " +"disabling all critical thermal trip point actions.\n" , d->ident); + nocrt =1 ; +return 0 ; +} + +static int thermal_tzp (const struct dmi_system_id *d) { + +if (tzp ==0 ) { +pr_notice (PREFIX "%s detected: " +"enabling thermal zone polling\n" , d->ident); + tzp =300 ;/* 300 dS = 30 Seconds */ + } +return 0 ; +} + +static int thermal_psv (const struct dmi_system_id *d) { + +if (psv ==0 ) { +pr_notice (PREFIX "%s detected: " +"disabling all passive thermal trip points\n" , d->ident); + psv =-1 ; + } +return 0 ; +} +static struct dmi_system_id thermal_dmi_table[]__initdata = {/* * Award BIOS on this AOpen makes thermal control almost worthless.
@@ -1199,39 +1237,4 @@ static int acpi_thermal_resume(struct device *dev) }#endif -static int thermal_act (const struct dmi_system_id *d) { - -if (act ==0 ) { -pr_notice (PREFIX "%s detected: " -"disabling all active thermal trip points\n" , d->ident); - act =-1 ; - } -return 0 ; -} -static int thermal_nocrt (const struct dmi_system_id *d) { - -pr_notice (PREFIX "%s detected: " -"disabling all critical thermal trip point actions.\n" , d->ident); - nocrt =1 ; -return 0 ; -} -static int thermal_tzp (const struct dmi_system_id *d) { - -if (tzp ==0 ) { -pr_notice (PREFIX "%s detected: " -"enabling thermal zone polling\n" , d->ident); - tzp =300 ;/* 300 dS = 30 Seconds */ - } -return 0 ; -} -static int thermal_psv (const struct dmi_system_id *d) { - -if (psv ==0 ) { -pr_notice (PREFIX "%s detected: " -"disabling all passive thermal trip points\n" , d->ident); - psv =-1 ; - } -return 0 ; -} -module_acpi_driver (acpi_thermal_driver);
Signature · 1 line
1.8.4.rc3
Quoted 4 lines · Andy Shevchenko
Previous patch didn't move callback function definitions before usage, thus we end up with ea compilation error. This patch fixes it.
Signed-off-by Andy Shevchenko <[email protected]>
Can you please fold this into the patch that was broken and resend?
Rafael
Quoted 94 lines
--- drivers/acpi/thermal.c | 73 ++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 35 deletions(-)drivers/acpi/thermal.c +38
-35@@ -978,6 +978,44 @@ static void acpi_thermal_notify(struct acpi_device *device, u32 event) } } +static int thermal_act (const struct dmi_system_id *d) { + +if (act ==0 ) { +pr_notice (PREFIX "%s detected: " +"disabling all active thermal trip points\n" , d->ident); + act =-1 ; + } +return 0 ; +} + +static int thermal_nocrt (const struct dmi_system_id *d) { + +pr_notice (PREFIX "%s detected: " +"disabling all critical thermal trip point actions.\n" , d->ident); + nocrt =1 ; +return 0 ; +} + +static int thermal_tzp (const struct dmi_system_id *d) { + +if (tzp ==0 ) { +pr_notice (PREFIX "%s detected: " +"enabling thermal zone polling\n" , d->ident); + tzp =300 ;/* 300 dS = 30 Seconds */ + } +return 0 ; +} + +static int thermal_psv (const struct dmi_system_id *d) { + +if (psv ==0 ) { +pr_notice (PREFIX "%s detected: " +"disabling all passive thermal trip points\n" , d->ident); + psv =-1 ; + } +return 0 ; +} +static struct dmi_system_id thermal_dmi_table[]__initdata = {/* * Award BIOS on this AOpen makes thermal control almost worthless. @@ -1199,39 +1237,4 @@ static int acpi_thermal_resume(struct device *dev) }#endif -static int thermal_act (const struct dmi_system_id *d) { - -if (act ==0 ) { -pr_notice (PREFIX "%s detected: " -"disabling all active thermal trip points\n" , d->ident); - act =-1 ; - } -return 0 ; -} -static int thermal_nocrt (const struct dmi_system_id *d) { - -pr_notice (PREFIX "%s detected: " -"disabling all critical thermal trip point actions.\n" , d->ident); - nocrt =1 ; -return 0 ; -} -static int thermal_tzp (const struct dmi_system_id *d) { - -if (tzp ==0 ) { -pr_notice (PREFIX "%s detected: " -"enabling thermal zone polling\n" , d->ident); - tzp =300 ;/* 300 dS = 30 Seconds */ - } -return 0 ; -} -static int thermal_psv (const struct dmi_system_id *d) { - -if (psv ==0 ) { -pr_notice (PREFIX "%s detected: " -"disabling all passive thermal trip points\n" , d->ident); - psv =-1 ; - } -return 0 ; -} -module_acpi_driver (acpi_thermal_driver);
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.