Skip to contentSkip to conversation

ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER'

PATCH In review Paul Bolle 2 participants 2 messages May 16, 2014 – Jul 4, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support
lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 ARM: pxa: fix typo 'CONFIG_SPI_PXA2XX_MASTER'

CONFIG_SPI_PXA2XX_MASTER was used were it was surely meant to use CONFIG_SPI_PXA2XX_MODULE. Use the IS_ENABLED() macro here, as it guards against typos like this one.

Signed-off-by Paul Bolle <[email protected]>

---
Untested, and (hardware) testing for the modular case might be needed. This typo was introduced in v2.6.28.

 arch/arm/mach-pxa/corgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-pxa/corgi.c +1 -1
index 57d60542f982..ccff8d82cc27 100644
@@ -513,7 +513,7 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {
 	.gpio_pullup		= CORGI_GPIO_USB_PULLUP,
 };
 
-#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MASTER)
+#if IS_ENABLED(CONFIG_SPI_PXA2XX)
 static struct pxa2xx_spi_master corgi_spi_info = {
 	.num_chipselect	= 3,
 };
Signature · 1 line
1.9.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 26 lines · Paul Bolle

CONFIG_SPI_PXA2XX_MASTER was used were it was surely meant to use CONFIG_SPI_PXA2XX_MODULE. Use the IS_ENABLED() macro here, as it guards against typos like this one.

Signed-off-by Paul Bolle <[email protected]>

---
Untested, and (hardware) testing for the modular case might be needed. This typo was introduced in v2.6.28.

 arch/arm/mach-pxa/corgi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-pxa/corgi.c +1 -2
index 57d60542f982..ccff8d82cc27 100644
@@ -513,7 +513,7 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {
        .gpio_pullup            = CORGI_GPIO_USB_PULLUP,
 };
 
-#if defined(CONFIG_SPI_PXA2XX) || defined(CONFIG_SPI_PXA2XX_MASTER)
+#if IS_ENABLED(CONFIG_SPI_PXA2XX)
 static struct pxa2xx_spi_master corgi_spi_info = {
        .num_chipselect = 3,
 };
--
Quoted 2 lines

1.9.0

Acked-by Haojian Zhuang <[email protected]>