powerpc/8xx: replace #ifdefs by IS_ENABLED() in microcode.c

Reduce #ifdef mess by using IS_ENABLED() instead.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/8xx/micropatch.c b/arch/powerpc/platforms/8xx/micropatch.c
index 2fdd8f935501522dcf7ab49d8dfda6cf56441007..0bb51531323eef1aee82481213216738484fc553 100644 (file)
--- a/arch/powerpc/platforms/8xx/micropatch.c
+++ b/arch/powerpc/platforms/8xx/micropatch.c
@@ -244,14 +244,9 @@ static void __init cpm_write_patch(cpm8xx_t *cp, int offset, uint *patch, int le
 void __init cpm_load_patch(cpm8xx_t *cp)
 {
        volatile cpm8xx_t       *commproc;
-#if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \
-    defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
        volatile iic_t          *iip;
        volatile struct spi_pram *spp;
-#ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH
        volatile smc_uart_t     *smp;
-#endif
-#endif
        commproc = cp;
 
        commproc->cp_rccr = 0;
@@ -260,24 +255,22 @@ void __init cpm_load_patch(cpm8xx_t *cp)
        cpm_write_patch(cp, 0xf00, patch_2f00, sizeof(patch_2f00));
        cpm_write_patch(cp, 0xe00, patch_2e00, sizeof(patch_2e00));
 
-#if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \
-    defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
-
-       iip = (iic_t *)&commproc->cp_dparam[PROFF_IIC];
-# define RPBASE 0x0500
-       iip->iic_rpbase = RPBASE;
+       if (IS_ENABLED(CONFIG_I2C_SPI_UCODE_PATCH) ||
+           IS_ENABLED(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)) {
+               u16 rpbase = 0x500;
 
-       /* Put SPI above the IIC, also 32-byte aligned.
-       */
-       spp = (struct spi_pram *)&commproc->cp_dparam[PROFF_SPI];
-       spp->rpbase = (RPBASE + sizeof(iic_t) + 31) & ~31;
+               iip = (iic_t *)&commproc->cp_dparam[PROFF_IIC];
+               iip->iic_rpbase = rpbase;
 
-# if defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)
-       smp = (smc_uart_t *)&commproc->cp_dparam[PROFF_SMC1];
-       smp->smc_rpbase = 0x1FC0;
-# endif /* CONFIG_I2C_SPI_SMC1_UCODE_PATCH) */
+               /* Put SPI above the IIC, also 32-byte aligned. */
+               spp = (struct spi_pram *)&commproc->cp_dparam[PROFF_SPI];
+               spp->rpbase = (rpbase + sizeof(iic_t) + 31) & ~31;
 
-#endif /* some variation of the I2C/SPI patch was selected */
+               if (IS_ENABLED(CONFIG_I2C_SPI_SMC1_UCODE_PATCH)) {
+                       smp = (smc_uart_t *)&commproc->cp_dparam[PROFF_SMC1];
+                       smp->smc_rpbase = 0x1FC0;
+               }
+       }
 
        commproc->cp_cpmcr1 = patch_params.cpmcr1;
        commproc->cp_cpmcr2 = patch_params.cpmcr2;