mtd: cfi: Get rid of redundant 'else'
PATCH 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(-)
include/linux/mtd/cfi.h +16 -16
@@ -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);
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Quoted 10 lines · Andy Shevchenko
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]>
Quoted 57 lines
--- include/linux/mtd/cfi.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)include/linux/mtd/cfi.h +16
-16@@ -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);
Quoted 11 lines · Andy Shevchenko
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