imx: spl: Remove ifdefs in spl_mmc_boot_mode()

It is hard to read code which contains nested ifdef blocks.  Replace
them with normal if-blocks and the IS_ENABLED() macro.  This is not only
more readable but also helps as both arms are validated by the compiler
in all cases.

Signed-off-by: Harald Seiler <hws@denx.de>

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index e3f51e45edf29063d24fa43818941b09bfcf6b47..32d78b799c36789c03eb0d5534c18c61afc7c29e 100644 (file)
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -197,23 +197,19 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
        case SD1_BOOT:
        case SD2_BOOT:
        case SD3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
-               return MMCSD_MODE_FS;
-#else
-               return MMCSD_MODE_RAW;
-#endif
-               break;
+               if (IS_ENABLED(CONFIG_SPL_FAT_SUPPORT))
+                       return MMCSD_MODE_FS;
+               else
+                       return MMCSD_MODE_RAW;
        case MMC1_BOOT:
        case MMC2_BOOT:
        case MMC3_BOOT:
-#if defined(CONFIG_SPL_FAT_SUPPORT)
-               return MMCSD_MODE_FS;
-#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
-               return MMCSD_MODE_EMMCBOOT;
-#else
-               return MMCSD_MODE_RAW;
-#endif
-               break;
+               if (IS_ENABLED(CONFIG_SPL_FAT_SUPPORT))
+                       return MMCSD_MODE_FS;
+               else if (IS_ENABLED(CONFIG_SUPPORT_EMMC_BOOT))
+                       return MMCSD_MODE_EMMCBOOT;
+               else
+                       return MMCSD_MODE_RAW;
        default:
                puts("spl: ERROR:  unsupported device\n");
                hang();
@@ -224,14 +220,12 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
        case BOOT_DEVICE_MMC1:
        case BOOT_DEVICE_MMC2:
        case BOOT_DEVICE_MMC2_2:
-#if defined(CONFIG_SPL_FS_FAT)
-               return MMCSD_MODE_FS;
-#elif defined(CONFIG_SUPPORT_EMMC_BOOT)
-               return MMCSD_MODE_EMMCBOOT;
-#else
-               return MMCSD_MODE_RAW;
-#endif
-               break;
+               if (IS_ENABLED(CONFIG_SPL_FS_FAT))
+                       return MMCSD_MODE_FS;
+               else if (IS_ENABLED(CONFIG_SUPPORT_EMMC_BOOT))
+                       return MMCSD_MODE_EMMCBOOT;
+               else
+                       return MMCSD_MODE_RAW;
        default:
                puts("spl: ERROR:  unsupported device\n");
                hang();