diff mbox

[2/2] mmc: dw_mmc: Print proper voltage on error

Message ID 1468332502-28016-2-git-send-email-k.kozlowski@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Krzysztof Kozlowski July 12, 2016, 2:08 p.m. UTC
The commit 97f659a2e972 ("mmc: dw_mmc: prevent to set the wrong
value") reordered the code so the 'uhs' variable used in
mmc_regulator_set_vqmmc() error message is always 0 at that time thus
always printing 3.3 voltage.  Instead use value obtained from ios in
printed error message.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/mmc/host/dw_mmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

kernel test robot July 12, 2016, 8:23 p.m. UTC | #1
Hi,

[auto build test ERROR on next-20160712]
[cannot apply to ulf.hansson-mmc/next v4.7-rc7 v4.7-rc6 v4.7-rc5 v4.7-rc7]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Krzysztof-Kozlowski/mmc-core-Add-helper-for-mapping-IOS-voltage-to-string/20160712-221741
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

>> ERROR: "mmc_voltage_to_str" [drivers/mmc/host/dw_mmc.ko] undefined!

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Jaehoon Chung July 13, 2016, 1:35 a.m. UTC | #2
Hi Krzysztof,

On 07/12/2016 11:08 PM, Krzysztof Kozlowski wrote:
> The commit 97f659a2e972 ("mmc: dw_mmc: prevent to set the wrong
> value") reordered the code so the 'uhs' variable used in
> mmc_regulator_set_vqmmc() error message is always 0 at that time thus
> always printing 3.3 voltage.  Instead use value obtained from ios in
> printed error message.

The commit 97f659a2e972 was dropped because some board didn't work fine.
Some boards didn't use the vqmmc suppy and not defined into device-tree.

It's short time to fix. I will re-send the patch on next.
At that time, i will check this patch.

Best Regards,
Jaehoon Chung

> 
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  drivers/mmc/host/dw_mmc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index c2a128628b31..7de561065003 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -1416,8 +1416,8 @@ static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
>  	ret = mmc_regulator_set_vqmmc(mmc, ios);
>  	if (ret) {
>  		dev_err(&mmc->class_dev,
> -				 "Regulator set error %d - %s V\n",
> -				 ret, uhs & v18 ? "1.8" : "3.3");
> +				 "Regulator set error %d - %s\n",
> +				 ret, mmc_voltage_to_str(ios));
>  		return ret;
>  	}
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski July 13, 2016, 7:55 a.m. UTC | #3
On 07/13/2016 03:35 AM, Jaehoon Chung wrote:
> Hi Krzysztof,
> 
> On 07/12/2016 11:08 PM, Krzysztof Kozlowski wrote:
>> The commit 97f659a2e972 ("mmc: dw_mmc: prevent to set the wrong
>> value") reordered the code so the 'uhs' variable used in
>> mmc_regulator_set_vqmmc() error message is always 0 at that time thus
>> always printing 3.3 voltage.  Instead use value obtained from ios in
>> printed error message.
> 
> The commit 97f659a2e972 was dropped because some board didn't work fine.
> Some boards didn't use the vqmmc suppy and not defined into device-tree.
> 
> It's short time to fix. I will re-send the patch on next.
> At that time, i will check this patch.

Ah, okay. If 97f659a2e972 is dropped, there is no need for this patchset.

Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index c2a128628b31..7de561065003 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1416,8 +1416,8 @@  static int dw_mci_switch_voltage(struct mmc_host *mmc, struct mmc_ios *ios)
 	ret = mmc_regulator_set_vqmmc(mmc, ios);
 	if (ret) {
 		dev_err(&mmc->class_dev,
-				 "Regulator set error %d - %s V\n",
-				 ret, uhs & v18 ? "1.8" : "3.3");
+				 "Regulator set error %d - %s\n",
+				 ret, mmc_voltage_to_str(ios));
 		return ret;
 	}