diff mbox

[2/9] mmc: meson-gx: minor improvements in meson_mmc_set_ios

Message ID 834a9dbd-9f6b-8dea-6713-e9bdcd09f9ed@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Heiner Kallweit Jan. 31, 2017, 8:57 p.m. UTC
val isn't used in the switch clause and afterwards there's an
identical statement. So remove it.

In case of an unexpected bus width the error message indicates
the intention to set the bus width to 4 and to go on.
So remove the return statement. This return statement also
conflicts with "setting to 4" because nothing would be set
actually before returning.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/mmc/host/meson-gx-mmc.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Jaehoon Chung Feb. 1, 2017, 11:55 a.m. UTC | #1
On 02/01/2017 05:57 AM, Heiner Kallweit wrote:
> val isn't used in the switch clause and afterwards there's an
> identical statement. So remove it.
> 
> In case of an unexpected bus width the error message indicates
> the intention to set the bus width to 4 and to go on.
> So remove the return statement. This return statement also
> conflicts with "setting to 4" because nothing would be set
> actually before returning.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>  drivers/mmc/host/meson-gx-mmc.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index da3cce31..38edc60d 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -379,7 +379,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>  	meson_mmc_clk_set(host, ios->clock);
>  
>  	/* Bus width */
> -	val = readl(host->regs + SD_EMMC_CFG);
>  	switch (ios->bus_width) {
>  	case MMC_BUS_WIDTH_1:
>  		bus_width = CFG_BUS_WIDTH_1;
> @@ -394,7 +393,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>  		dev_err(host->dev, "Invalid ios->bus_width: %u.  Setting to 4.\n",
>  			ios->bus_width);
>  		bus_width = CFG_BUS_WIDTH_4;
> -		return;

It's a different question..why does meson-gx-mmc use 4bit buswidth for invalid bus-with? not using 1bit-buswidth?

Best Regards,
Jaehoon Chung

>  	}
>  
>  	val = readl(host->regs + SD_EMMC_CFG);
> 

--
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
Heiner Kallweit Feb. 1, 2017, 8:16 p.m. UTC | #2
Am 01.02.2017 um 12:55 schrieb Jaehoon Chung:
> On 02/01/2017 05:57 AM, Heiner Kallweit wrote:
>> val isn't used in the switch clause and afterwards there's an
>> identical statement. So remove it.
>>
>> In case of an unexpected bus width the error message indicates
>> the intention to set the bus width to 4 and to go on.
>> So remove the return statement. This return statement also
>> conflicts with "setting to 4" because nothing would be set
>> actually before returning.
>>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>> ---
>>  drivers/mmc/host/meson-gx-mmc.c | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
>> index da3cce31..38edc60d 100644
>> --- a/drivers/mmc/host/meson-gx-mmc.c
>> +++ b/drivers/mmc/host/meson-gx-mmc.c
>> @@ -379,7 +379,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>>  	meson_mmc_clk_set(host, ios->clock);
>>  
>>  	/* Bus width */
>> -	val = readl(host->regs + SD_EMMC_CFG);
>>  	switch (ios->bus_width) {
>>  	case MMC_BUS_WIDTH_1:
>>  		bus_width = CFG_BUS_WIDTH_1;
>> @@ -394,7 +393,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>>  		dev_err(host->dev, "Invalid ios->bus_width: %u.  Setting to 4.\n",
>>  			ios->bus_width);
>>  		bus_width = CFG_BUS_WIDTH_4;
>> -		return;
> 
> It's a different question..why does meson-gx-mmc use 4bit buswidth for invalid bus-with? not using 1bit-buswidth?
> 
I think this question is best addressed to Kevin as original author.

> Best Regards,
> Jaehoon Chung
> 
>>  	}
>>  
>>  	val = readl(host->regs + SD_EMMC_CFG);
>>
> 
> 

--
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
Kevin Hilman Feb. 3, 2017, 1:52 p.m. UTC | #3
Heiner Kallweit <hkallweit1@gmail.com> writes:

> Am 01.02.2017 um 12:55 schrieb Jaehoon Chung:
>> On 02/01/2017 05:57 AM, Heiner Kallweit wrote:
>>> val isn't used in the switch clause and afterwards there's an
>>> identical statement. So remove it.
>>>
>>> In case of an unexpected bus width the error message indicates
>>> the intention to set the bus width to 4 and to go on.
>>> So remove the return statement. This return statement also
>>> conflicts with "setting to 4" because nothing would be set
>>> actually before returning.
>>>
>>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
>>> ---
>>>  drivers/mmc/host/meson-gx-mmc.c | 2 --
>>>  1 file changed, 2 deletions(-)
>>>
>>> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
>>> index da3cce31..38edc60d 100644
>>> --- a/drivers/mmc/host/meson-gx-mmc.c
>>> +++ b/drivers/mmc/host/meson-gx-mmc.c
>>> @@ -379,7 +379,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>>>  	meson_mmc_clk_set(host, ios->clock);
>>>  
>>>  	/* Bus width */
>>> -	val = readl(host->regs + SD_EMMC_CFG);
>>>  	switch (ios->bus_width) {
>>>  	case MMC_BUS_WIDTH_1:
>>>  		bus_width = CFG_BUS_WIDTH_1;
>>> @@ -394,7 +393,6 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>>>  		dev_err(host->dev, "Invalid ios->bus_width: %u.  Setting to 4.\n",
>>>  			ios->bus_width);
>>>  		bus_width = CFG_BUS_WIDTH_4;
>>> -		return;
>> 
>> It's a different question..why does meson-gx-mmc use 4bit buswidth for invalid bus-with? not using 1bit-buswidth?
>> 
> I think this question is best addressed to Kevin as original author.
>

Because that was the fall-back in the vendor driver that this was based
on.

I'm not really an MMC expert, so I don't know if that's the right thing
to do.

Kevin
--
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/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index da3cce31..38edc60d 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -379,7 +379,6 @@  static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	meson_mmc_clk_set(host, ios->clock);
 
 	/* Bus width */
-	val = readl(host->regs + SD_EMMC_CFG);
 	switch (ios->bus_width) {
 	case MMC_BUS_WIDTH_1:
 		bus_width = CFG_BUS_WIDTH_1;
@@ -394,7 +393,6 @@  static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 		dev_err(host->dev, "Invalid ios->bus_width: %u.  Setting to 4.\n",
 			ios->bus_width);
 		bus_width = CFG_BUS_WIDTH_4;
-		return;
 	}
 
 	val = readl(host->regs + SD_EMMC_CFG);