From 321848131a0175b73005789ab97aa8f0e0467d60 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 9 Feb 2012 22:57:16 +0100 Subject: [PATCH] --- yaml --- r: 297365 b: refs/heads/master c: 4932bd64a2bb4e80b79efb20c4736ac3b30ba7fe h: refs/heads/master i: 297363: f4ce7e6be2279108fe951b0733acd92a984e6d1c v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/tmio_mmc_pio.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aec13163a488..40cddbea14ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 996bc8aebd2cd5b6d4c5d85085f171fa2447f364 +refs/heads/master: 4932bd64a2bb4e80b79efb20c4736ac3b30ba7fe diff --git a/trunk/drivers/mmc/host/tmio_mmc_pio.c b/trunk/drivers/mmc/host/tmio_mmc_pio.c index 950824a00717..9a7996ade58e 100644 --- a/trunk/drivers/mmc/host/tmio_mmc_pio.c +++ b/trunk/drivers/mmc/host/tmio_mmc_pio.c @@ -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) { struct tmio_mmc_host *host = mmc_priv(mmc); + struct device *dev = &host->pdev->dev; unsigned long flags; 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); if (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", current->comm, task_pid_nr(current), ios->clock, ios->power_mode); host->mrq = ERR_PTR(-EINTR); } else { - dev_dbg(&host->pdev->dev, + dev_dbg(dev, "%s.%d: CMD%u active since %lu, now %lu!\n", current->comm, task_pid_nr(current), 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 (!host->power) { - pm_runtime_get_sync(&host->pdev->dev); + pm_runtime_get_sync(dev); host->power = true; } 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); if (host->power) { host->power = false; - pm_runtime_put(&host->pdev->dev); + pm_runtime_put(dev); } tmio_mmc_clk_stop(host); }