Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01e77e13 authored by Carlos Eduardo Aguiar's avatar Carlos Eduardo Aguiar Committed by Pierre Ossman
Browse files

MMC: OMAP: Using setup_timer instead of init_timer 



Using setup_timer() instead of init_timer() on omap.c file.

Signed-off-by: default avatarCarlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent eb1860bc

drivers/mmc/host/omap.c

+4 −10
Original line number Diff line number Diff line
@@ -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);