diff options
author | Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br> | 2008-03-26 16:09:34 -0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-04-18 14:05:30 -0400 |
commit | 01e77e13fc5a1e6c00ebb4f688293fa3116315ee (patch) | |
tree | 0da0472de75d2c4ff63dd53de075adda42cb7f03 /drivers | |
parent | eb1860bccd01a75b20fd7298af89b9cbda2202ba (diff) |
MMC: OMAP: Using setup_timer instead of init_timer
Using setup_timer() instead of init_timer() on omap.c file.
Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/omap.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index a1dfa74c50ab..9075838f712f 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -1235,9 +1235,8 @@ static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id) | |||
1235 | goto err_remove_slot_name; | 1235 | goto err_remove_slot_name; |
1236 | 1236 | ||
1237 | INIT_WORK(&slot->switch_work, mmc_omap_cover_handler); | 1237 | INIT_WORK(&slot->switch_work, mmc_omap_cover_handler); |
1238 | init_timer(&slot->switch_timer); | 1238 | setup_timer(&slot->switch_timer, mmc_omap_switch_timer, |
1239 | slot->switch_timer.function = mmc_omap_switch_timer; | 1239 | (unsigned long) slot); |
1240 | slot->switch_timer.data = (unsigned long) slot; | ||
1241 | schedule_work(&slot->switch_work); | 1240 | schedule_work(&slot->switch_work); |
1242 | } | 1241 | } |
1243 | 1242 | ||
@@ -1302,18 +1301,13 @@ static int __init mmc_omap_probe(struct platform_device *pdev) | |||
1302 | } | 1301 | } |
1303 | 1302 | ||
1304 | INIT_WORK(&host->cmd_abort, mmc_omap_abort_command); | 1303 | INIT_WORK(&host->cmd_abort, mmc_omap_abort_command); |
1305 | init_timer(&host->cmd_timer); | 1304 | setup_timer(&host->cmd_timer, mmc_omap_cmd_timer, (unsigned long) host); |
1306 | host->cmd_timer.function = mmc_omap_cmd_timer; | ||
1307 | host->cmd_timer.data = (unsigned long) host; | ||
1308 | 1305 | ||
1309 | spin_lock_init(&host->dma_lock); | 1306 | spin_lock_init(&host->dma_lock); |
1310 | init_timer(&host->dma_timer); | 1307 | setup_timer(&host->dma_timer, mmc_omap_dma_timer, (unsigned long) host); |
1311 | spin_lock_init(&host->slot_lock); | 1308 | spin_lock_init(&host->slot_lock); |
1312 | init_waitqueue_head(&host->slot_wq); | 1309 | init_waitqueue_head(&host->slot_wq); |
1313 | 1310 | ||
1314 | host->dma_timer.function = mmc_omap_dma_timer; | ||
1315 | host->dma_timer.data = (unsigned long) host; | ||
1316 | |||
1317 | host->pdata = pdata; | 1311 | host->pdata = pdata; |
1318 | host->dev = &pdev->dev; | 1312 | host->dev = &pdev->dev; |
1319 | platform_set_drvdata(pdev, host); | 1313 | platform_set_drvdata(pdev, host); |