[PATCH 2/2] mmc: Remove dead code

[PATCH 2/2] mmc: Remove dead code

[Philippe De Swert]

bus_width is passed to the function and when 0 (MMC_BUS_WIDTH_1)
will cause the function to return. So in in the second test it 
definitly is different from 0, and the third test is redundant.

Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>
---
 drivers/mmc/core/mmc.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 54df5ad..4a1bf8f 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -556,14 +556,10 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
 	err = mmc_get_ext_csd(card, &bw_ext_csd);
 
 	if (err || bw_ext_csd == NULL) {
-		if (bus_width != MMC_BUS_WIDTH_1)
-			err = -EINVAL;
+		err = -EINVAL;
 		goto out;
 	}
 
-	if (bus_width == MMC_BUS_WIDTH_1)
-		goto out;
-
 	/* only compare read only fields */
 	err = !((card->ext_csd.raw_partition_support ==
 			bw_ext_csd[EXT_CSD_PARTITION_SUPPORT]) &&
-- 
1.7.9.5

Re: [PATCH 2/2] mmc: Remove dead code

[Philip Rakity]

Acked-by: Philip Rakity <prakity@marvell.com>

On Apr 11, 2012, at 1:32 PM, Philippe De Swert wrote:

> bus_width is passed to the function and when 0 (MMC_BUS_WIDTH_1)
> will cause the function to return. So in in the second test it 
> definitly is different from 0, and the third test is redundant.
> 
> Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>
> ---
> drivers/mmc/core/mmc.c |    6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 54df5ad..4a1bf8f 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -556,14 +556,10 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
> 	err = mmc_get_ext_csd(card, &bw_ext_csd);
> 
> 	if (err || bw_ext_csd == NULL) {
> -		if (bus_width != MMC_BUS_WIDTH_1)
> -			err = -EINVAL;
> +		err = -EINVAL;
> 		goto out;
> 	}
> 
> -	if (bus_width == MMC_BUS_WIDTH_1)
> -		goto out;
> -
> 	/* only compare read only fields */
> 	err = !((card->ext_csd.raw_partition_support ==
> 			bw_ext_csd[EXT_CSD_PARTITION_SUPPORT]) &&
> -- 
> 1.7.9.5
> 

Re: [PATCH 2/2] mmc: Remove dead code

[Namjae Jeon]

2012/4/12 Philippe De Swert <philippedeswert@gmail.com>:
> bus_width is passed to the function and when 0 (MMC_BUS_WIDTH_1)
> will cause the function to return. So in in the second test it
> definitly is different from 0, and the third test is redundant.
>
> Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>
> ---
Looks good to me.
Reviewed-by: Namjae Jeon <linkinjeon@gmail.com>

Re: [PATCH 2/2] mmc: Remove dead code

[Namjae Jeon]

Hi. Chris.

Would you check this patch also ?

Thanks.

2012/4/12, Namjae Jeon <linkinjeon@gmail.com>:
> 2012/4/12 Philippe De Swert <philippedeswert@gmail.com>:
>> bus_width is passed to the function and when 0 (MMC_BUS_WIDTH_1)
>> will cause the function to return. So in in the second test it
>> definitly is different from 0, and the third test is redundant.
>>
>> Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>
>> ---
> Looks good to me.
> Reviewed-by: Namjae Jeon <linkinjeon@gmail.com>
>

Re: [PATCH 2/2] mmc: Remove dead code

[Chris Ball]

Hi,

On Wed, Apr 11 2012, Philippe De Swert wrote:
> bus_width is passed to the function and when 0 (MMC_BUS_WIDTH_1)
> will cause the function to return. So in in the second test it 
> definitly is different from 0, and the third test is redundant.
>
> Signed-off-by: Philippe De Swert <philippedeswert@gmail.com>
> ---
>  drivers/mmc/core/mmc.c |    6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 54df5ad..4a1bf8f 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -556,14 +556,10 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
>  	err = mmc_get_ext_csd(card, &bw_ext_csd);
>  
>  	if (err || bw_ext_csd == NULL) {
> -		if (bus_width != MMC_BUS_WIDTH_1)
> -			err = -EINVAL;
> +		err = -EINVAL;
>  		goto out;
>  	}
>  
> -	if (bus_width == MMC_BUS_WIDTH_1)
> -		goto out;
> -
>  	/* only compare read only fields */
>  	err = !((card->ext_csd.raw_partition_support ==
>  			bw_ext_csd[EXT_CSD_PARTITION_SUPPORT]) &&

Thanks, pushed for mmc-next for 3.5.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child