• Anton Vorontsov's avatar
    powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations · 2069a6ae
    Anton Vorontsov authored
    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>
    2069a6ae
micropatch.c 11.1 KB