From: Len Brown Date: Fri, 8 Dec 2006 09:43:41 +0000 (-0500) Subject: ACPI: ibm_acpi: respond to workqueue update X-Git-Tag: v2.6.20-rc2~6^2~10 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c68a33b7b74b37793b1250007e5e21d621a7fc;p=linux-2.6 ACPI: ibm_acpi: respond to workqueue update Signed-off-by: Len Brown --- diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c index 92e7b6eb8f..ab18007353 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()) {