AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

mmc: tmio: cosmetic: prettify the tmio_mmc_set_ios() function

Browse Source 
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Guennadi Liakhovetski 2012-02-09 22:57:16 +01:00 committed by Chris Ball
parent 996bc8aebd
commit 4932bd64a2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/host/tmio_mmc_pio.c
View File

@ -760,6 +760,7 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
{ {
struct tmio_mmc_host *host = mmc_priv(mmc); struct tmio_mmc_host *host = mmc_priv(mmc);
struct device *dev = &host->pdev->dev;
unsigned long flags; unsigned long flags;
mutex_lock(&host->ios_lock); mutex_lock(&host->ios_lock);
@ -767,13 +768,13 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
if (host->mrq) { if (host->mrq) {
if (IS_ERR(host->mrq)) { if (IS_ERR(host->mrq)) {
dev_dbg(&host->pdev->dev, dev_dbg(dev,
"%s.%d: concurrent .set_ios(), clk %u, mode %u\n", "%s.%d: concurrent .set_ios(), clk %u, mode %u\n",
current->comm, task_pid_nr(current), current->comm, task_pid_nr(current),
ios->clock, ios->power_mode); ios->clock, ios->power_mode);
host->mrq = ERR_PTR(-EINTR); host->mrq = ERR_PTR(-EINTR);
} else { } else {
dev_dbg(&host->pdev->dev, dev_dbg(dev,
"%s.%d: CMD%u active since %lu, now %lu!\n", "%s.%d: CMD%u active since %lu, now %lu!\n",
current->comm, task_pid_nr(current), current->comm, task_pid_nr(current),
host->mrq->cmd->opcode, host->last_req_ts, jiffies); host->mrq->cmd->opcode, host->last_req_ts, jiffies);
@ -796,7 +797,7 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
*/ */
if (ios->power_mode == MMC_POWER_ON && ios->clock) { if (ios->power_mode == MMC_POWER_ON && ios->clock) {
if (!host->power) { if (!host->power) {
pm_runtime_get_sync(&host->pdev->dev); pm_runtime_get_sync(dev);
host->power = true; host->power = true;
} }
tmio_mmc_set_clock(host, ios->clock); tmio_mmc_set_clock(host, ios->clock);
@ -810,7 +811,7 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
host->set_pwr(host->pdev, 0); host->set_pwr(host->pdev, 0);
if (host->power) { if (host->power) {
host->power = false; host->power = false;
pm_runtime_put(&host->pdev->dev); pm_runtime_put(dev);
} }
tmio_mmc_clk_stop(host); tmio_mmc_clk_stop(host);
} }