* [PATCH 7/9] OMAP: HSMMC: Use mod_timer from a single point for readability.
@ 2008-11-21 9:25 Adrian Hunter
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:25 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
---
drivers/mmc/host/omap_hsmmc.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e329115..d81f9af 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -192,6 +192,11 @@ static void mmc_omap_idle_timer(unsigned long data)
mmc_omap_fclk_state(host, OFF);
}
+static void mmc_omap_fclk_lazy_disable(struct mmc_omap_host *host)
+{
+ mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+}
+
/*
* Stop clock to the card
*/
@@ -332,7 +337,7 @@ mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
if (!data->stop) {
host->mrq = NULL;
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
mmc_request_done(host->mmc, data->mrq);
return;
}
@@ -361,7 +366,7 @@ mmc_omap_cmd_done(struct mmc_omap_host *host, struct mmc_command *cmd)
}
if (host->data == NULL || cmd->error) {
host->mrq = NULL;
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
mmc_request_done(host->mmc, cmd->mrq);
}
}
@@ -577,7 +582,7 @@ static void mmc_omap_detect(struct work_struct *work)
while (OMAP_HSMMC_READ(host->base, SYSCTL) & SRD) ;
mmc_detect_change(host->mmc, (HZ * 50) / 1000);
}
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
}
/*
@@ -878,7 +883,7 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
if (ios->power_mode == MMC_POWER_OFF)
mmc_omap_fclk_state(host, OFF);
else
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
}
static int omap_hsmmc_get_cd(struct mmc_host *mmc)
@@ -1093,7 +1098,7 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
if (ret < 0)
goto err_cover_switch;
}
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
return 0;
@@ -1233,7 +1238,6 @@ static int omap_mmc_resume(struct platform_device *pdev)
return 0;
if (host) {
-
if (mmc_omap_fclk_state(host, ON) != 0)
goto clk_en_err;
@@ -1260,7 +1264,7 @@ static int omap_mmc_resume(struct platform_device *pdev)
if (ret == 0)
host->suspended = 0;
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
}
return ret;
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 0/9] OMAP: HSMMC: Patches
@ 2008-11-21 9:23 Adrian Hunter
2008-11-21 9:37 ` Adrian Hunter
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:23 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
Hi
OMAP HSMMC is not ready for mainline, but development is ongoing.
In the meantime these patches are best posted and applied via
omap mailing list and tree.
Regards
Adrian
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 0/9] OMAP: HSMMC: Patches
2008-11-21 9:23 [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
@ 2008-11-21 9:37 ` Adrian Hunter
2008-11-21 9:52 ` [PATCH 7/9] OMAP: HSMMC: Use mod_timer from a single point for readability Adrian Hunter
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:37 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
Adrian Hunter wrote:
> Hi
>
> OMAP HSMMC is not ready for mainline, but development is ongoing.
>
> In the meantime these patches are best posted and applied via
> omap mailing list and tree.
>
> Regards
> Adrian
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Just realised I forgot the from lines in all those patches - will resend.
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 7/9] OMAP: HSMMC: Use mod_timer from a single point for readability.
2008-11-21 9:37 ` Adrian Hunter
@ 2008-11-21 9:52 ` Adrian Hunter
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Hunter @ 2008-11-21 9:52 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap@vger.kernel.org Mailing List
From: Jarkko Lavinen <jarkko.lavinen@nokia.com>
Date: Thu, 6 Nov 2008 16:02:30 +0200
Signed-off-by: Jarkko Lavinen <jarkko.lavinen@nokia.com>
---
drivers/mmc/host/omap_hsmmc.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index e329115..d81f9af 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -192,6 +192,11 @@ static void mmc_omap_idle_timer(unsigned long data)
mmc_omap_fclk_state(host, OFF);
}
+static void mmc_omap_fclk_lazy_disable(struct mmc_omap_host *host)
+{
+ mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+}
+
/*
* Stop clock to the card
*/
@@ -332,7 +337,7 @@ mmc_omap_xfer_done(struct mmc_omap_host *host, struct mmc_data *data)
if (!data->stop) {
host->mrq = NULL;
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
mmc_request_done(host->mmc, data->mrq);
return;
}
@@ -361,7 +366,7 @@ mmc_omap_cmd_done(struct mmc_omap_host *host, struct mmc_command *cmd)
}
if (host->data == NULL || cmd->error) {
host->mrq = NULL;
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
mmc_request_done(host->mmc, cmd->mrq);
}
}
@@ -577,7 +582,7 @@ static void mmc_omap_detect(struct work_struct *work)
while (OMAP_HSMMC_READ(host->base, SYSCTL) & SRD) ;
mmc_detect_change(host->mmc, (HZ * 50) / 1000);
}
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
}
/*
@@ -878,7 +883,7 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
if (ios->power_mode == MMC_POWER_OFF)
mmc_omap_fclk_state(host, OFF);
else
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
}
static int omap_hsmmc_get_cd(struct mmc_host *mmc)
@@ -1093,7 +1098,7 @@ static int __init omap_mmc_probe(struct platform_device *pdev)
if (ret < 0)
goto err_cover_switch;
}
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
return 0;
@@ -1233,7 +1238,6 @@ static int omap_mmc_resume(struct platform_device *pdev)
return 0;
if (host) {
-
if (mmc_omap_fclk_state(host, ON) != 0)
goto clk_en_err;
@@ -1260,7 +1264,7 @@ static int omap_mmc_resume(struct platform_device *pdev)
if (ret == 0)
host->suspended = 0;
- mod_timer(&host->idle_timer, jiffies + IDLE_TIMEOUT);
+ mmc_omap_fclk_lazy_disable(host);
}
return ret;
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-21 9:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-21 9:25 [PATCH 7/9] OMAP: HSMMC: Use mod_timer from a single point for readability Adrian Hunter
-- strict thread matches above, loose matches on Subject: below --
2008-11-21 9:23 [PATCH 0/9] OMAP: HSMMC: Patches Adrian Hunter
2008-11-21 9:37 ` Adrian Hunter
2008-11-21 9:52 ` [PATCH 7/9] OMAP: HSMMC: Use mod_timer from a single point for readability Adrian Hunter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox