[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <AANLkTikQupSvmvcd92h6-pcuRM8keZRbU9g2bepq9NC-@mail.gmail.com>
Date: Tue, 31 Aug 2010 16:35:31 +0200
From: Linus Walleij <linus.ml.walleij@...il.com>
To: Adrian Hunter <adrian.hunter@...ia.com>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Daniel Mack <daniel@...aq.de>,
Pierre Ossman <pierre@...man.eu>,
Matt Fleming <matt@...sole-pimps.org>,
David Brownell <dbrownell@...rs.sourceforge.net>,
Russell King <rmk+kernel@....linux.org.uk>,
Eric Miao <eric.y.miao@...il.com>,
Cliff Brake <cbrake@...-systems.com>,
"Lavinen Jarkko (Nokia-MS/Helsinki)" <jarkko.lavinen@...ia.com>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Liam Girdwood <lrg@...mlogic.co.uk>,
Tony Lindgren <tony@...mide.com>,
Robert Jarzmik <robert.jarzmik@...e.fr>,
Sundar Iyer <sundar.iyer@...ricsson.com>,
Bengt Jonsson <bengt.jonsson@...ricsson.com>,
"linux-mmc@...r.kernel.org" <linux-mmc@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH] MMC: move regulator handling closer to core
2010/8/30 Adrian Hunter <adrian.hunter@...ia.com>:
> [Me]
>> diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
>> index 0a4e43f..47dae9b 100644
>> --- a/drivers/mmc/host/pxamci.c
>> +++ b/drivers/mmc/host/pxamci.c
>> @@ -99,14 +99,26 @@ static inline void pxamci_init_ocr(struct pxamci_host
>> *host)
>> }
>> }
>> -static inline void pxamci_set_power(struct pxamci_host *host, unsigned
>> int vdd)
>> +static inline void pxamci_set_power(struct pxamci_host *host,
>> + unsigned char power_mode,
>> + unsigned int vdd)
>> {
>> int on;
>> -#ifdef CONFIG_REGULATOR
>> - if (host->vcc)
>> - mmc_regulator_set_ocr(host->vcc, vdd);
>> -#endif
>> + if (host->vcc) {
>> + int ret;
>> +
>> + if (power_mode == MMC_POWER_UP) {
>> + ret = mmc_regulator_set_ocr(host->mmc, host->vcc,
>> vdd);
>> + if (ret)
>> + dev_err(mmc_dev(host->mmc),
>> + "could not set regulator OCR\n");
>> + } else if (power_mode == MMC_POWER_OFF)
>> + ret = mmc_regulator_set_ocr(host->mmc, host->vcc,
>> 0);
>> + if (ret)
>> + dev_err(mmc_dev(host->mmc),
>> + "could not disable regulator\n");
>> + }
>
> mmc_power_off() does set ios->vdd to 0 so the original code was fine
> wrt to ignoring power_mode.
Yeah I know. This bit was to increase readability, explicitly showing
the power state like this makes it more clear what is happening I think.
The rest of the comments are fixed, new patch soon.
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists