Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations

Warnings are treated as errors for arch/powerpc code, so build fails
with CONFIG_I2C_SPI_UCODE_PATCH=y:

CC arch/powerpc/sysdev/micropatch.o
cc1: warnings being treated as errors
arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
arch/powerpc/sysdev/micropatch.c:630: warning: unused variable 'smp'
make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1

And with CONFIG_USB_SOF_UCODE_PATCH=y:

CC arch/powerpc/sysdev/micropatch.o
cc1: warnings being treated as errors
arch/powerpc/sysdev/micropatch.c: In function 'cpm_load_patch':
arch/powerpc/sysdev/micropatch.c:629: warning: unused variable 'spp'
arch/powerpc/sysdev/micropatch.c:628: warning: unused variable 'iip'
make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1

This patch fixes these issues by introducing proper #ifdefs.

Cc: <stable@kernel.org> [ .33, .34 ]
Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

authored by

Anton Vorontsov and committed by
Kumar Gala
2069a6ae 56825c88

+5
+5
arch/powerpc/sysdev/micropatch.c
··· 626 626 { 627 627 volatile uint *dp; /* Dual-ported RAM. */ 628 628 volatile cpm8xx_t *commproc; 629 + #if defined(CONFIG_I2C_SPI_UCODE_PATCH) || \ 630 + defined(CONFIG_I2C_SPI_SMC1_UCODE_PATCH) 629 631 volatile iic_t *iip; 630 632 volatile struct spi_pram *spp; 633 + #ifdef CONFIG_I2C_SPI_SMC1_UCODE_PATCH 631 634 volatile smc_uart_t *smp; 635 + #endif 636 + #endif 632 637 int i; 633 638 634 639 commproc = cp;