Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2069a6ae authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

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: default avatarAnton Vorontsov <avorontsov@mvista.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 56825c88

arch/powerpc/sysdev/micropatch.c

+5 −0
Original line number Diff line number Diff line
@@ -626,9 +626,14 @@ cpm_load_patch(cpm8xx_t *cp) 
{

	volatile uint		*dp;		/* Dual-ported RAM. */

	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

	int	i;



	commproc = cp;