releases/upstream/2.6.20-rc2/0024-ACPI-ibm_acpi-respond-to-workqueue-update.txt

   1 From 25c68a33b7b74b37793b1250007e5e21d621a7fc Mon Sep 17 00:00:00 2001
   2 From: Len Brown <len.brown@intel.com>
   3 Date: Fri, 8 Dec 2006 04:43:41 -0500
   4 Subject: [PATCH 24/28] ACPI: ibm_acpi: respond to workqueue update
   5
   6 Signed-off-by: Len Brown <len.brown@intel.com>
   7 ---
   8  drivers/acpi/ibm_acpi.c |    6 +++---
   9  1 files changed, 3 insertions(+), 3 deletions(-)
  10
  11 diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
  12 index 92e7b6e..ab18007 100644
  13 --- a/drivers/acpi/ibm_acpi.c
  14 +++ b/drivers/acpi/ibm_acpi.c
  15 @@ -1825,9 +1825,9 @@ static enum fan_control_commands fan_control_commands;
  16  static int fan_control_status_known;
  17  static u8 fan_control_initial_status;
  18
  19 -static void fan_watchdog_fire(void *ignored);
  20 +static void fan_watchdog_fire(struct work_struct *ignored);
  21  static int fan_watchdog_maxinterval;
  22 -static DECLARE_WORK(fan_watchdog_task, fan_watchdog_fire, NULL);
  23 +static DECLARE_DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire);
  24
  25  static int fan_init(void)
  26  {
  27 @@ -2284,7 +2284,7 @@ static int fan_write(char *buf)
  28         return rc;
  29  }
  30
  31 -static void fan_watchdog_fire(void *ignored)
  32 +static void fan_watchdog_fire(struct work_struct *ignored)
  33  {
  34         printk(IBM_NOTICE "fan watchdog: enabling fan\n");
  35         if (fan_set_enable()) {
  36 --
  37 1.4.4.2
  38