* [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable
@ 2013-04-04 5:55 Sachin Kamat
2013-04-04 5:55 ` [PATCH v2 2/2] mmc: dw_mmc: Use pr_info instead of printk Sachin Kamat
2013-04-04 6:11 ` [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable Seungwon Jeon
0 siblings, 2 replies; 4+ messages in thread
From: Sachin Kamat @ 2013-04-04 5:55 UTC (permalink / raw)
To: linux-mmc; +Cc: cjb, tgih.jun, sachin.kamat, patches
regulator_enable() is declared with __must_check attribute.
Hence check the return value to ensure that the regulator is enabled.
Fixes the following warning:
drivers/mmc/host/dw_mmc.c:2461:19: warning:
ignoring return value of ‘regulator_enable’, declared with attribute
warn_unused_result [-Wunused-result]
drivers/mmc/host/dw_mmc.c: In function ‘dw_mci_init_slot’:
drivers/mmc/host/dw_mmc.c:1994:19: warning:
ignoring return value of ‘regulator_enable’, declared with attribute
warn_unused_result [-Wunused-result]
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
---
Changes since v1:
Changed 'if (ret != 0)' to 'if (ret)'
---
drivers/mmc/host/dw_mmc.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index a443820..4e3ebff 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1990,8 +1990,14 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
if (IS_ERR(host->vmmc)) {
pr_info("%s: no vmmc regulator found\n", mmc_hostname(mmc));
host->vmmc = NULL;
- } else
- regulator_enable(host->vmmc);
+ } else {
+ ret = regulator_enable(host->vmmc);
+ if (ret) {
+ dev_err(host->dev,
+ "failed to enable regulator: %d\n", ret);
+ goto err_setup_bus;
+ }
+ }
if (dw_mci_get_cd(mmc))
set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
@@ -2457,8 +2463,14 @@ int dw_mci_resume(struct dw_mci *host)
{
int i, ret;
- if (host->vmmc)
- regulator_enable(host->vmmc);
+ if (host->vmmc) {
+ ret = regulator_enable(host->vmmc);
+ if (ret) {
+ dev_err(host->dev,
+ "failed to enable regulator: %d\n", ret);
+ return ret;
+ }
+ }
if (!mci_wait_reset(host->dev, host)) {
ret = -ENODEV;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 2/2] mmc: dw_mmc: Use pr_info instead of printk
2013-04-04 5:55 [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable Sachin Kamat
@ 2013-04-04 5:55 ` Sachin Kamat
2013-04-04 6:11 ` [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable Seungwon Jeon
1 sibling, 0 replies; 4+ messages in thread
From: Sachin Kamat @ 2013-04-04 5:55 UTC (permalink / raw)
To: linux-mmc; +Cc: cjb, tgih.jun, sachin.kamat, patches
pr_info(... is preferred to printk(KERN_INFO ...
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
---
No change since v1
---
drivers/mmc/host/dw_mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 4e3ebff..84f4464 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2509,7 +2509,7 @@ EXPORT_SYMBOL(dw_mci_resume);
static int __init dw_mci_init(void)
{
- printk(KERN_INFO "Synopsys Designware Multimedia Card Interface Driver");
+ pr_info("Synopsys Designware Multimedia Card Interface Driver\n");
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable
2013-04-04 5:55 [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable Sachin Kamat
2013-04-04 5:55 ` [PATCH v2 2/2] mmc: dw_mmc: Use pr_info instead of printk Sachin Kamat
@ 2013-04-04 6:11 ` Seungwon Jeon
2013-04-04 14:18 ` Chris Ball
1 sibling, 1 reply; 4+ messages in thread
From: Seungwon Jeon @ 2013-04-04 6:11 UTC (permalink / raw)
To: 'Sachin Kamat', linux-mmc; +Cc: cjb, patches
On Thursday, April 04, 2013, Sachin Kamat wrote:
> regulator_enable() is declared with __must_check attribute.
> Hence check the return value to ensure that the regulator is enabled.
> Fixes the following warning:
> drivers/mmc/host/dw_mmc.c:2461:19: warning:
> ignoring return value of ‘regulator_enable’, declared with attribute
> warn_unused_result [-Wunused-result]
> drivers/mmc/host/dw_mmc.c: In function ‘dw_mci_init_slot’:
> drivers/mmc/host/dw_mmc.c:1994:19: warning:
> ignoring return value of ‘regulator_enable’, declared with attribute
> warn_unused_result [-Wunused-result]
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Thanks,
Seungwon Jeon
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable
2013-04-04 6:11 ` [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable Seungwon Jeon
@ 2013-04-04 14:18 ` Chris Ball
0 siblings, 0 replies; 4+ messages in thread
From: Chris Ball @ 2013-04-04 14:18 UTC (permalink / raw)
To: Seungwon Jeon; +Cc: 'Sachin Kamat', linux-mmc, patches
Hi,
On Thu, Apr 04 2013, Seungwon Jeon wrote:
> On Thursday, April 04, 2013, Sachin Kamat wrote:
>> regulator_enable() is declared with __must_check attribute.
>> Hence check the return value to ensure that the regulator is enabled.
>> Fixes the following warning:
>> drivers/mmc/host/dw_mmc.c:2461:19: warning:
>> ignoring return value of ‘regulator_enable’, declared with attribute
>> warn_unused_result [-Wunused-result]
>> drivers/mmc/host/dw_mmc.c: In function ‘dw_mci_init_slot’:
>> drivers/mmc/host/dw_mmc.c:1994:19: warning:
>> ignoring return value of ‘regulator_enable’, declared with attribute
>> warn_unused_result [-Wunused-result]
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
> Acked-by: Seungwon Jeon <tgih.jun@samsung.com>
Thanks, both patches pushed to mmc-next for 3.10.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-04 14:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-04 5:55 [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable Sachin Kamat
2013-04-04 5:55 ` [PATCH v2 2/2] mmc: dw_mmc: Use pr_info instead of printk Sachin Kamat
2013-04-04 6:11 ` [PATCH v2 1/2] mmc: dw_mmc: Check return value of regulator_enable Seungwon Jeon
2013-04-04 14:18 ` Chris Ball
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox