* [PATCH 12/18] MMC: OMAP: Using setup_timer instead of init_timer
@ 2008-01-28 19:07 Carlos Aguiar
0 siblings, 0 replies; 3+ messages in thread
From: Carlos Aguiar @ 2008-01-28 19:07 UTC (permalink / raw)
To: Pierre Ossman; +Cc: Tony Lindgren, linux-kernel
From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
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>
---
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 62b9d71..7525727 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1264,9 +1264,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);
}
@@ -1342,18 +1341,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);
-- 1.5.3.GIT
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 00/18] MMC: OMAP: Sync MMC OMAP driver with mainline tree
@ 2008-03-14 19:35 Carlos Aguiar
2008-03-24 12:26 ` Pierre Ossman
0 siblings, 1 reply; 3+ messages in thread
From: Carlos Aguiar @ 2008-03-14 19:35 UTC (permalink / raw)
To: Pierre Ossman; +Cc: Tony Lindgren, linux-kernel
Hi Pierre, Tony and folks,
The new version of the patch series that follows is a synchronization
of MMC OMAP driver from Linux-OMAP tree into mainline tree.
Improvements and corrections are based on comments from Pierre Ossman and
Roel Kluin, from LKML.
Just to remind you, basically it brings MMC multislot support for OMAP boards
with one slot (like H2 1611, H3 1710) or two slots (like H4 2420 and N800).
Others boards supported by such feature are: N770, Siemens SX1 and Apollon.
BR,
Carlos.
--
Carlos Eduardo Aguiar
Nokia Institute of Technology - INdT
Open Source Mobile Research Center - OSMRC - Manaus
Core Team
Phone: +55 92 2126-1079
Mobile: +55 92 8127-1797
E-mail: carlos.aguiar@indt.org.br
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 00/18] MMC: OMAP: Sync MMC OMAP driver with mainline tree
2008-03-14 19:35 [PATCH 00/18] MMC: OMAP: Sync MMC OMAP driver with mainline tree Carlos Aguiar
@ 2008-03-24 12:26 ` Pierre Ossman
2008-03-26 20:09 ` [PATCH 12/18] MMC: OMAP: Using setup_timer instead of init_timer Carlos Aguiar
0 siblings, 1 reply; 3+ messages in thread
From: Pierre Ossman @ 2008-03-24 12:26 UTC (permalink / raw)
To: Carlos Aguiar; +Cc: Tony Lindgren, linux-kernel
On Fri, 14 Mar 2008 15:35:56 -0400
Carlos Aguiar <carlos.aguiar@indt.org.br> wrote:
Except for the issue with the device attributes, the patch set looks fine. Send me a fix for that patch (and affected subsequent) and I'll queue it up.
--
-- Pierre Ossman
Linux kernel, MMC maintainer http://www.kernel.org
PulseAudio, core developer http://pulseaudio.org
rdesktop, core developer http://www.rdesktop.org
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 12/18] MMC: OMAP: Using setup_timer instead of init_timer
2008-03-24 12:26 ` Pierre Ossman
@ 2008-03-26 20:09 ` Carlos Aguiar
0 siblings, 0 replies; 3+ messages in thread
From: Carlos Aguiar @ 2008-03-26 20:09 UTC (permalink / raw)
To: ext Pierre Ossman; +Cc: Tony Lindgren, linux-kernel
From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
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>
---
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 0646912..9ac1066 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)
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);
-- 1.5.3.GIT
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 12/18] MMC: OMAP: Using setup_timer instead of init_timer
@ 2008-03-14 19:36 Carlos Aguiar
0 siblings, 0 replies; 3+ messages in thread
From: Carlos Aguiar @ 2008-03-14 19:36 UTC (permalink / raw)
To: Pierre Ossman; +Cc: Tony Lindgren, linux-kernel
From: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
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>
---
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 f9cbda3..e6bf5e7 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1245,9 +1245,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);
}
@@ -1324,18 +1323,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);
-- 1.5.3.GIT
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-26 20:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-28 19:07 [PATCH 12/18] MMC: OMAP: Using setup_timer instead of init_timer Carlos Aguiar
-- strict thread matches above, loose matches on Subject: below --
2008-03-14 19:35 [PATCH 00/18] MMC: OMAP: Sync MMC OMAP driver with mainline tree Carlos Aguiar
2008-03-24 12:26 ` Pierre Ossman
2008-03-26 20:09 ` [PATCH 12/18] MMC: OMAP: Using setup_timer instead of init_timer Carlos Aguiar
2008-03-14 19:36 Carlos Aguiar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox