ARM: OMAP: Workqueue changes for board-h4.c

Workqueue changes for board-h4.c

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Dirk Behme 2007-01-25 16:29:17 -08:00 committed by Tony Lindgren
parent 53037f4c10
commit 060ebf97b4

View File

@ -179,9 +179,11 @@ static int h4_select_irda(struct device *dev, int state)
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;
@ -191,7 +193,7 @@ static void set_trans_mode(void *data)
expa &= ~0x01;
if (!(*mode & IR_SIRMODE)) { /* MIR/FIR */
if (!(mode & IR_SIRMODE)) { /* MIR/FIR */
expa |= 0x01;
}
@ -204,9 +206,9 @@ static int h4_transceiver_mode(struct device *dev, int mode)
{
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;