* [PATCH] ata: pata_ali: remove redundant return statement
@ 2022-01-12 23:47 Colin Ian King
2022-01-12 23:52 ` Damien Le Moal
0 siblings, 1 reply; 3+ messages in thread
From: Colin Ian King @ 2022-01-12 23:47 UTC (permalink / raw)
To: Damien Le Moal, linux-ide; +Cc: kernel-janitors, linux-kernel
A return statement is unnecessarily complicated, currently value
in variable mask is bitwise-masked and the variable is being
updated and then returned. Just updating the mask is all that is
required as the following statement is a return.
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
drivers/ata/pata_ali.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index ab28a6707b94..1b90cda27246 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -123,7 +123,7 @@ static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)
mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
if (strstr(model_num, "WDC"))
- return mask &= ~ATA_MASK_UDMA;
+ mask &= ~ATA_MASK_UDMA;
return mask;
}
--
2.33.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ata: pata_ali: remove redundant return statement
2022-01-12 23:47 [PATCH] ata: pata_ali: remove redundant return statement Colin Ian King
@ 2022-01-12 23:52 ` Damien Le Moal
2022-01-13 0:11 ` Colin King (gmail)
0 siblings, 1 reply; 3+ messages in thread
From: Damien Le Moal @ 2022-01-12 23:52 UTC (permalink / raw)
To: Colin Ian King, linux-ide; +Cc: kernel-janitors, linux-kernel
On 1/13/22 08:47, Colin Ian King wrote:
> A return statement is unnecessarily complicated, currently value
> in variable mask is bitwise-masked and the variable is being
> updated and then returned. Just updating the mask is all that is
> required as the following statement is a return.
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
> drivers/ata/pata_ali.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
> index ab28a6707b94..1b90cda27246 100644
> --- a/drivers/ata/pata_ali.c
> +++ b/drivers/ata/pata_ali.c
> @@ -123,7 +123,7 @@ static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)
> mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
> ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
> if (strstr(model_num, "WDC"))
> - return mask &= ~ATA_MASK_UDMA;
Yeah, not to mention that is really ugly as the return should really
have been:
return mask & ~ATA_MASK_UDMA;
> + mask &= ~ATA_MASK_UDMA;
> return mask;
> }
>
Will queue this up.
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ata: pata_ali: remove redundant return statement
2022-01-12 23:52 ` Damien Le Moal
@ 2022-01-13 0:11 ` Colin King (gmail)
0 siblings, 0 replies; 3+ messages in thread
From: Colin King (gmail) @ 2022-01-13 0:11 UTC (permalink / raw)
To: Damien Le Moal, linux-ide; +Cc: kernel-janitors, linux-kernel
On 12/01/2022 23:52, Damien Le Moal wrote:
> On 1/13/22 08:47, Colin Ian King wrote:
>> A return statement is unnecessarily complicated, currently value
>> in variable mask is bitwise-masked and the variable is being
>> updated and then returned. Just updating the mask is all that is
>> required as the following statement is a return.
>>
>> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
>> ---
>> drivers/ata/pata_ali.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
>> index ab28a6707b94..1b90cda27246 100644
>> --- a/drivers/ata/pata_ali.c
>> +++ b/drivers/ata/pata_ali.c
>> @@ -123,7 +123,7 @@ static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)
>> mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
>> ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
>> if (strstr(model_num, "WDC"))
>> - return mask &= ~ATA_MASK_UDMA;
>
> Yeah, not to mention that is really ugly as the return should really
> have been:
>
> return mask & ~ATA_MASK_UDMA;
Yep, I did think of that as the original intention, but two return
statements one after the other was equally as ugly. It was a 50/50
choice of what was perceived as the better fix :-)
>
>> + mask &= ~ATA_MASK_UDMA;
>> return mask;
>> }
>>
>
> Will queue this up.
>
Thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-13 0:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-12 23:47 [PATCH] ata: pata_ali: remove redundant return statement Colin Ian King
2022-01-12 23:52 ` Damien Le Moal
2022-01-13 0:11 ` Colin King (gmail)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®