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 <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240503184230.2927283-1-andriy.shevchenko@linux.intel.com

diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 947410faf9e2c9216b5aebfcb49dbb365799d44c..35ca19ae21ae057217400f7dbbc5136835912fb0 100644 (file)
--- 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);