From cfe2e26c08ebaa039eaa6f963c6ac846c39f198b Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Aguiar Date: Wed, 26 Mar 2008 16:09:34 -0400 Subject: [PATCH] --- yaml --- r: 91783 b: refs/heads/master c: 01e77e13fc5a1e6c00ebb4f688293fa3116315ee h: refs/heads/master i: 91781: 88f35abfb032c53675527e45cba1bf490b319da2 91779: f8e365742cb5c54e1835f4b8ccafb31c1574fb11 91775: 8c1bafb635d44832554ca8aaec156acd7690de71 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index b48753f83a5e..2e22f8f69a53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb1860bccd01a75b20fd7298af89b9cbda2202ba +refs/heads/master: 01e77e13fc5a1e6c00ebb4f688293fa3116315ee diff --git a/trunk/drivers/mmc/host/omap.c b/trunk/drivers/mmc/host/omap.c index a1dfa74c50ab..9075838f712f 100644 --- a/trunk/drivers/mmc/host/omap.c +++ b/trunk/drivers/mmc/host/omap.c @@ -1235,9 +1235,8 @@ static int __init mmc_omap_new_slot(struct mmc_omap_host *host, int id) goto err_remove_slot_name; INIT_WORK(&slot->switch_work, mmc_omap_cover_handler); - init_timer(&slot->switch_timer); - slot->switch_timer.function = mmc_omap_switch_timer; - slot->switch_timer.data = (unsigned long) slot; + setup_timer(&slot->switch_timer, mmc_omap_switch_timer, + (unsigned long) slot); schedule_work(&slot->switch_work); } @@ -1302,18 +1301,13 @@ static int __init mmc_omap_probe(struct platform_device *pdev) } INIT_WORK(&host->cmd_abort, mmc_omap_abort_command); - init_timer(&host->cmd_timer); - host->cmd_timer.function = mmc_omap_cmd_timer; - host->cmd_timer.data = (unsigned long) host; + setup_timer(&host->cmd_timer, mmc_omap_cmd_timer, (unsigned long) host); spin_lock_init(&host->dma_lock); - init_timer(&host->dma_timer); + setup_timer(&host->dma_timer, mmc_omap_dma_timer, (unsigned long) host); spin_lock_init(&host->slot_lock); init_waitqueue_head(&host->slot_wq); - host->dma_timer.function = mmc_omap_dma_timer; - host->dma_timer.data = (unsigned long) host; - host->pdata = pdata; host->dev = &pdev->dev; platform_set_drvdata(pdev, host);