2024-05-03 18:42:54

by Andy Shevchenko

Subject: [PATCH v1 1/1] mtd: cfi: Get rid of redundant 'else'

In the snippets like the following

if (...)
return / goto / break / continue ...;
else
...

the 'else' is redundant. Get rid of it.

Signed-off-by: Andy Shevchenko <[email protected]>
---
include/linux/mtd/cfi.h | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 947410faf9e2..35ca19ae21ae 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -308,32 +308,32 @@ static inline uint8_t cfi_read_query(struct map_info *map, uint32_t addr)
{
map_word val = map_read(map, addr);

- if (map_bankwidth_is_1(map)) {
+ if (map_bankwidth_is_1(map))
return val.x[0];
- } else if (map_bankwidth_is_2(map)) {
+ if (map_bankwidth_is_2(map))
return cfi16_to_cpu(map, val.x[0]);
- } else {
- /* No point in a 64-bit byteswap since that would just be
- swapping the responses from different chips, and we are
- only interested in one chip (a representative sample) */
- return cfi32_to_cpu(map, val.x[0]);
- }
+ /*
+ * No point in a 64-bit byteswap since that would just be
+ * swapping the responses from different chips, and we are
+ * only interested in one chip (a representative sample)
+ */
+ return cfi32_to_cpu(map, val.x[0]);
}

static inline uint16_t cfi_read_query16(struct map_info *map, uint32_t addr)
{
map_word val = map_read(map, addr);

- if (map_bankwidth_is_1(map)) {
+ if (map_bankwidth_is_1(map))
return val.x[0] & 0xff;
- } else if (map_bankwidth_is_2(map)) {
+ if (map_bankwidth_is_2(map))
return cfi16_to_cpu(map, val.x[0]);
- } else {
- /* No point in a 64-bit byteswap since that would just be
- swapping the responses from different chips, and we are
- only interested in one chip (a representative sample) */
- return cfi32_to_cpu(map, val.x[0]);
- }
+ /*
+ * No point in a 64-bit byteswap since that would just be
+ * swapping the responses from different chips, and we are
+ * only interested in one chip (a representative sample)
+ */
+ return cfi32_to_cpu(map, val.x[0]);
}

void cfi_udelay(int us);
--
2.43.0.rc1.1336.g36b5255a03ac

2024-05-03 18:49:59

by Jeff Johnson

Subject: Re: [PATCH v1 1/1] mtd: cfi: Get rid of redundant 'else'

On 5/3/2024 11:42 AM, Andy Shevchenko wrote:
> In the snippets like the following
>
> if (...)
> return / goto / break / continue ...;
> else
> ...
>
> the 'else' is redundant. Get rid of it.
>
> Signed-off-by: Andy Shevchenko <[email protected]>

Reviewed-by: Jeff Johnson <[email protected]>

> ---
> include/linux/mtd/cfi.h | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
> index 947410faf9e2..35ca19ae21ae 100644
> --- a/include/linux/mtd/cfi.h
> +++ b/include/linux/mtd/cfi.h
> @@ -308,32 +308,32 @@ static inline uint8_t cfi_read_query(struct map_info *map, uint32_t addr)
> {
> map_word val = map_read(map, addr);
>
> - if (map_bankwidth_is_1(map)) {
> + if (map_bankwidth_is_1(map))
> return val.x[0];
> - } else if (map_bankwidth_is_2(map)) {
> + if (map_bankwidth_is_2(map))
> return cfi16_to_cpu(map, val.x[0]);
> - } else {
> - /* No point in a 64-bit byteswap since that would just be
> - swapping the responses from different chips, and we are
> - only interested in one chip (a representative sample) */
> - return cfi32_to_cpu(map, val.x[0]);
> - }
> + /*
> + * No point in a 64-bit byteswap since that would just be
> + * swapping the responses from different chips, and we are
> + * only interested in one chip (a representative sample)
> + */
> + return cfi32_to_cpu(map, val.x[0]);
> }
>
> static inline uint16_t cfi_read_query16(struct map_info *map, uint32_t addr)
> {
> map_word val = map_read(map, addr);
>
> - if (map_bankwidth_is_1(map)) {
> + if (map_bankwidth_is_1(map))
> return val.x[0] & 0xff;
> - } else if (map_bankwidth_is_2(map)) {
> + if (map_bankwidth_is_2(map))
> return cfi16_to_cpu(map, val.x[0]);
> - } else {
> - /* No point in a 64-bit byteswap since that would just be
> - swapping the responses from different chips, and we are
> - only interested in one chip (a representative sample) */
> - return cfi32_to_cpu(map, val.x[0]);
> - }
> + /*
> + * No point in a 64-bit byteswap since that would just be
> + * swapping the responses from different chips, and we are
> + * only interested in one chip (a representative sample)
> + */
> + return cfi32_to_cpu(map, val.x[0]);
> }
>
> void cfi_udelay(int us);

2024-05-27 12:17:27

by Miquel Raynal

Subject: Re: [PATCH v1 1/1] mtd: cfi: Get rid of redundant 'else'

On Fri, 2024-05-03 at 18:42:30 UTC, Andy Shevchenko wrote:
> In the snippets like the following
>
> if (...)
> return / goto / break / continue ...;
> else
> ...
>
> the 'else' is redundant. Get rid of it.
>
> Signed-off-by: Andy Shevchenko <[email protected]>
> Reviewed-by: Jeff Johnson <[email protected]>

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks.

Miquel