From 455670d5c9a7b5a81a78c82a5cb0f3081ffdb01c Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Thu, 25 Jan 2007 16:26:46 -0800 Subject: [PATCH 11/14] ARM: OMAP: H3 workqueue fixes Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- arch/arm/mach-omap1/board-h3.c | 12 +++++++----- include/asm-arm/arch-omap/irda.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) Index: linux-2.6/arch/arm/mach-omap1/board-h3.c =================================================================== --- linux-2.6.orig/arch/arm/mach-omap1/board-h3.c 2007-04-09 16:40:23.000000000 -0400 +++ linux-2.6/arch/arm/mach-omap1/board-h3.c 2007-04-09 16:40:34.000000000 -0400 @@ -296,9 +296,11 @@ static int h3_select_irda(struct device return err; } -static void set_trans_mode(void *data) +static void set_trans_mode(struct work_struct *work) { - int *mode = data; + struct omap_irda_config *irda_config = + container_of(work, struct omap_irda_config, gpio_expa.work); + int mode = irda_config->mode; unsigned char expa; int err = 0; @@ -308,7 +310,7 @@ static void set_trans_mode(void *data) expa &= ~0x03; - if (*mode & IR_SIRMODE) { + if (mode & IR_SIRMODE) { expa |= 0x01; } else { /* MIR/FIR */ expa |= 0x03; @@ -323,9 +325,9 @@ static int h3_transceiver_mode(struct de { struct omap_irda_config *irda_config = dev->platform_data; + irda_config->mode = mode; cancel_delayed_work(&irda_config->gpio_expa); - PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode); -#error this is not permitted - mode is an argument variable + PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode); schedule_delayed_work(&irda_config->gpio_expa, 0); return 0; Index: linux-2.6/include/asm-arm/arch-omap/irda.h =================================================================== --- linux-2.6.orig/include/asm-arm/arch-omap/irda.h 2007-04-09 16:38:12.000000000 -0400 +++ linux-2.6/include/asm-arm/arch-omap/irda.h 2007-04-09 16:40:34.000000000 -0400 @@ -31,6 +31,7 @@ struct omap_irda_config { unsigned long src_start; int tx_trigger; int rx_trigger; + int mode; }; #endif