The patch titled mmc: omap: using setup_timer instead of init_timer has been removed from the -mm tree. Its filename was mmc-omap-using-setup_timer-instead-of-init_timer.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mmc: omap: using setup_timer instead of init_timer From: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> Using setup_timer() instead of init_timer() on omap.c file. Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@xxxxxxxxxxx> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: Pierre Ossman <drzeus-list@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/omap.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff -puN drivers/mmc/host/omap.c~mmc-omap-using-setup_timer-instead-of-init_timer drivers/mmc/host/omap.c --- a/drivers/mmc/host/omap.c~mmc-omap-using-setup_timer-instead-of-init_timer +++ a/drivers/mmc/host/omap.c @@ -1245,9 +1245,8 @@ static int __init mmc_omap_new_slot(stru 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); } @@ -1324,18 +1323,13 @@ static int __init mmc_omap_probe(struct } 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); _ Patches currently in -mm which might be from carlos.aguiar@xxxxxxxxxxx are mmc-omap-using-setup_timer-instead-of-init_timer.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html