From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/19] omap_hsmmc: Ensure regulator enable / disable are paired
Date: Thu, 11 Feb 2010 16:51:27 -0800 [thread overview]
Message-ID: <20100212005127.24958.82734.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100212004844.24958.29506.stgit@baageli.muru.com>
From: Adrian Hunter <adrian.hunter@nokia.com>
Stop using 'regulator_is_enabled()' and just pair enables
with disables so that the regulator reference counts can
work correctly.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/mmc/host/omap_hsmmc.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index cb94044..d2fad58 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -296,11 +296,8 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
ret = mmc_regulator_set_ocr(host->vcc, 0);
}
} else {
- if (host->vcc_aux) {
- ret = regulator_is_enabled(host->vcc_aux);
- if (ret > 0)
- ret = regulator_disable(host->vcc_aux);
- }
+ if (host->vcc_aux)
+ ret = regulator_disable(host->vcc_aux);
if (ret == 0)
ret = mmc_regulator_set_ocr(host->vcc, 0);
}
@@ -1975,7 +1972,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
host->slot_id = 0;
host->mapbase = res->start;
host->base = ioremap(host->mapbase, SZ_4K);
- host->power_mode = -1;
+ host->power_mode = MMC_POWER_OFF;
platform_set_drvdata(pdev, host);
INIT_WORK(&host->mmc_carddetect_work, omap_hsmmc_detect);
next prev parent reply other threads:[~2010-02-12 0:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-12 0:51 [PATCH 00/19] omap updates for 2.6.34 merge window, part 2 Tony Lindgren
2010-02-12 0:51 ` [PATCH 01/19] omap_hsmmc: Move gpio and regulator control from board file Tony Lindgren
2010-02-12 0:51 ` [PATCH 02/19] omap: Rename mmc-twl4030 files to hsmmc Tony Lindgren
2010-02-12 0:51 ` [PATCH 03/19] omap: Rename hsmmc symbols to reflect independence from twl4030 Tony Lindgren
2010-02-12 0:51 ` [PATCH 04/19] omap: Reconnect hsmmc context loss count Tony Lindgren
2010-02-12 0:51 ` [PATCH 05/19] omap: RX51: Remux to pull eMMC lines down when powering off Tony Lindgren
2010-02-12 0:51 ` [PATCH 06/19] omap_hsmmc: Allow for power saving without going off Tony Lindgren
2010-02-12 0:51 ` [PATCH 07/19] omap_hsmmc: Fix disable timeouts Tony Lindgren
2010-02-12 0:51 ` Tony Lindgren [this message]
2010-02-12 0:51 ` [PATCH 09/19] omap_hsmmc: Allow for a shared VccQ Tony Lindgren
2010-02-12 0:51 ` [PATCH 10/19] omap_hsmmc: allow compile without regulator framework Tony Lindgren
2010-02-12 0:51 ` [PATCH 11/19] omap3: Clean-up for omap_mux_init Tony Lindgren
2010-02-12 0:51 ` [PATCH 12/19] omap3: pm: Add T2 Keypad as a wakeup source Tony Lindgren
2010-02-12 0:51 ` [PATCH 13/19] AM35xx: Introduce am35xx.h file Tony Lindgren
2010-02-12 0:51 ` [PATCH 14/19] AM35xx: Add AM35xx intr_clr & sw_rst cntrl reg bit definition Tony Lindgren
2010-02-12 0:51 ` [PATCH 15/19] AM35xx: Update irq.h for AM35xx IPSS module interrupts Tony Lindgren
2010-02-12 0:51 ` [PATCH 16/19] arm: omap: kill compile warning on board-4430-sdp.c Tony Lindgren
2010-02-12 0:51 ` [PATCH 17/19] OMAP4: IRQ: Add McPDM IRQ definition Tony Lindgren
2010-02-12 0:51 ` [PATCH 18/19] ARM: OMAP4: Add McPDM base address Tony Lindgren
2010-02-12 0:51 ` [PATCH 19/19] OMAP4: MCPDM: Register McPDM platform device Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100212005127.24958.82734.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).