Re: [PATCH 00/21] ACPI: ibm-acpi: cleanups, extended fan/thermal support

Len Brown
2006-12-16T05:44:23Z

applied, with this update to play with Linux-2.6.20-rc1

thanks,
-Len

commit 25c68a33b7b74b37793b1250007e5e21d621a7fc
Author: Len Brown <len.brown@intel.com>
Date: Fri Dec 8 04:43:41 2006 -0500

ACPI: ibm_acpi: respond to workqueue update

Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 92e7b6e..ab18007 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -1825,9 +1825,9 @@ static enum fan_control_commands fan_control_commands;
static int fan_control_status_known;
static u8 fan_control_initial_status;

-static void fan_watchdog_fire(void *ignored);
+static void fan_watchdog_fire(struct work_struct *ignored);
static int fan_watchdog_maxinterval;
-static DECLARE_WORK(fan_watchdog_task, fan_watchdog_fire, NULL);
+static DECLARE_DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire);

static int fan_init(void)
{
@@ -2284,7 +2284,7 @@ static int fan_write(char *buf)
return rc;
}

-static void fan_watchdog_fire(void *ignored)
+static void fan_watchdog_fire(struct work_struct *ignored)
{
printk(IBM_NOTICE "fan watchdog: enabling fan\n");
if (fan_set_enable()) {