diff options
Diffstat (limited to 'patches.kzm9g/0052-mmc-tmio-cosmetic-prettify-the-tmio_mmc_set_ios-func.patch')
| -rw-r--r-- | patches.kzm9g/0052-mmc-tmio-cosmetic-prettify-the-tmio_mmc_set_ios-func.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/patches.kzm9g/0052-mmc-tmio-cosmetic-prettify-the-tmio_mmc_set_ios-func.patch b/patches.kzm9g/0052-mmc-tmio-cosmetic-prettify-the-tmio_mmc_set_ios-func.patch deleted file mode 100644 index f4c6d66f0d0095..00000000000000 --- a/patches.kzm9g/0052-mmc-tmio-cosmetic-prettify-the-tmio_mmc_set_ios-func.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 62da637655deae3561b0ba9fd230afa6e15cc221 Mon Sep 17 00:00:00 2001 -From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> -Date: Thu, 9 Feb 2012 22:57:16 +0100 -Subject: mmc: tmio: cosmetic: prettify the tmio_mmc_set_ios() function - -Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> -Signed-off-by: Chris Ball <cjb@laptop.org> -(cherry picked from commit 4932bd64a2bb4e80b79efb20c4736ac3b30ba7fe) - -Signed-off-by: Simon Horman <horms@verge.net.au> ---- - drivers/mmc/host/tmio_mmc_pio.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c -index 97110ba..2500163 100644 ---- a/drivers/mmc/host/tmio_mmc_pio.c -+++ b/drivers/mmc/host/tmio_mmc_pio.c -@@ -759,6 +759,7 @@ fail: - 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); -@@ -766,13 +767,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); -@@ -795,7 +796,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); -@@ -809,7 +810,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); - } --- -1.7.10.2.565.gbd578b5 - |