ALSA: hda: cs35l41: fix building without CONFIG_SPI
PATCH 1/1 ALSA: hda: cs35l41: fix building without CONFIG_SPI
From: Arnd Bergmann <[email protected]>
When CONFIG_SPI is disabled, the driver produces unused-variable warning:
sound/pci/hda/cs35l41_hda_property.c: In function 'generic_dsd_config':sound/pci/hda/cs35l41_hda_property.c:181:28: error: unused variable 'spi' [-Werror=unused-variable]
181 | struct spi_device *spi;
| ^~~sound/pci/hda/cs35l41_hda_property.c:180:27: error: unused variable 'cs_gpiod' [-Werror=unused-variable]
180 | struct gpio_desc *cs_gpiod;
| ^~~~~~~~
Avoid these by turning the preprocessor contionals into equivalent C code, which also helps readability.
--- sound/pci/hda/cs35l41_hda_property.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
sound/pci/hda/cs35l41_hda_property.c +1 -3
@@ -215,7 +215,6 @@ static int generic_dsd_config(struct cs35l41_hda *cs35l41, struct device *physdeif (cs35l41->control_bus ==SPI ) { cs35l41->index = id; -#if IS_ENABLED (CONFIG_SPI )/* * Manually set the Chip Select for the second amp <cs_gpio_index> in the node. * This is only supported for systems with 2 amps, since we cannot expand the
@@ -224,7 +223,7 @@ static int generic_dsd_config(struct cs35l41_hda *cs35l41, struct device *physde* uses a native chip select), to ensure the second amp does not clash with the * first. */ -if (cfg->cs_gpio_index >=0 ) { +if (IS_ENABLED (CONFIG_SPI ) && cfg->cs_gpio_index >=0 ) { spi =to_spi_device (cs35l41->dev);if (cfg->num_amps !=2 ) {
@@ -255,7 +254,6 @@ static int generic_dsd_config(struct cs35l41_hda *cs35l41, struct device *physdespi_setup (spi); } } -#endif }else {if (cfg->num_amps >2 )/*
Signature · 1 line
2.39.2
Quoted 13 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
When
CONFIG_SPIis disabled, the driver produces unused-variable warning:
sound/pci/hda/cs35l41_hda_property.c: In function 'generic_dsd_config':sound/pci/hda/cs35l41_hda_property.c:181:28: error: unused variable 'spi' [-Werror=unused-variable]
181 | structspi_device*spi;
| ^~~sound/pci/hda/cs35l41_hda_property.c:180:27: error: unused variable 'cs_gpiod' [-Werror=unused-variable]
180 | structgpio_desc*cs_gpiod;
| ^~~~~~~~
Quoted 5 lines
Avoid these by turning the preprocessor contionals into equivalent C code, which also helps readability.
Fixes 916d051730ae ("ALSA: hda: cs35l41: Only add SPI CS GPIO if SPI is enabled in kernel")Signed-off-by Arnd Bergmann <[email protected]>
Applied now. Thanks.
Takashi