diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2007-01-04 07:03:16 +0100 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-01-04 07:03:38 +0100 |
| commit | 3947a3907f9cb88ebd492b6348a251036c4e81c7 (patch) | |
| tree | 79e91ed3b1695f456f1b395bfbcd74e3e94e3e1b /drivers/mmc | |
| parent | 7523c4dd9923cab748dad9b79d0165e118e3d03b (diff) | |
| download | kernel-crypto-3947a3907f9cb88ebd492b6348a251036c4e81c7.tar.gz kernel-crypto-3947a3907f9cb88ebd492b6348a251036c4e81c7.tar.xz kernel-crypto-3947a3907f9cb88ebd492b6348a251036c4e81c7.zip | |
ARM: OMAP: fix MMC workqueue changes
fix OMAP MMC workqueue in recent workqueue change
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/omap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index 435d331e772..9488408308f 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c @@ -581,9 +581,9 @@ static void mmc_omap_switch_timer(unsigned long arg) schedule_work(&host->switch_work); } -static void mmc_omap_switch_handler(void *data) +static void mmc_omap_switch_handler(struct work_struct *work) { - struct mmc_omap_host *host = (struct mmc_omap_host *) data; + struct mmc_omap_host *host = container_of(work, struct mmc_omap_host, switch_work); struct mmc_card *card; static int complained = 0; int cards = 0, cover_open; @@ -1116,7 +1116,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev) platform_set_drvdata(pdev, host); if (host->switch_pin >= 0) { - INIT_WORK(&host->switch_work, mmc_omap_switch_handler, host); + INIT_WORK(&host->switch_work, mmc_omap_switch_handler); init_timer(&host->switch_timer); host->switch_timer.function = mmc_omap_switch_timer; host->switch_timer.data = (unsigned long) host; |