aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/omap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 435d331e772a..9488408308fb 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -581,9 +581,9 @@ static void mmc_omap_switch_timer(unsigned long arg)
581 schedule_work(&host->switch_work); 581 schedule_work(&host->switch_work);
582} 582}
583 583
584static void mmc_omap_switch_handler(void *data) 584static void mmc_omap_switch_handler(struct work_struct *work)
585{ 585{
586 struct mmc_omap_host *host = (struct mmc_omap_host *) data; 586 struct mmc_omap_host *host = container_of(work, struct mmc_omap_host, switch_work);
587 struct mmc_card *card; 587 struct mmc_card *card;
588 static int complained = 0; 588 static int complained = 0;
589 int cards = 0, cover_open; 589 int cards = 0, cover_open;
@@ -1116,7 +1116,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
1116 platform_set_drvdata(pdev, host); 1116 platform_set_drvdata(pdev, host);
1117 1117
1118 if (host->switch_pin >= 0) { 1118 if (host->switch_pin >= 0) {
1119 INIT_WORK(&host->switch_work, mmc_omap_switch_handler, host); 1119 INIT_WORK(&host->switch_work, mmc_omap_switch_handler);
1120 init_timer(&host->switch_timer); 1120 init_timer(&host->switch_timer);
1121 host->switch_timer.function = mmc_omap_switch_timer; 1121 host->switch_timer.function = mmc_omap_switch_timer;
1122 host->switch_timer.data = (unsigned long) host; 1122 host->switch_timer.data = (unsigned long) host;