ASoC: cs4271: Fix build error without CONFIG_SPI_MASTER
diff mbox

Message ID 1394038411-11045-1-git-send-email-tiwai@suse.de
State Accepted
Commit 9c369c6e885599818d98ff7130d6ef62ce6ae8d4
Headers show

Commit Message

Takashi Iwai March 5, 2014, 4:53 p.m. UTC
cs4271_common_probe() is called from cs4271_i2c_probe() but defined in
CONFIG_SPI_MASTER block, thus it results in a build error when
CONFIG_SPI_MASTER=n:
  sound/soc/codecs/cs4271.c:721:2: error: implicit declaration of function ‘cs4271_common_probe’ [-Werror=implicit-function-declaration]

Move the function out of #if block.

Fixes: d6cf89ee07cb ('ASoC: cs4271: claim reset GPIO in bus probe function')
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/codecs/cs4271.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

Daniel Mack March 5, 2014, 5:03 p.m. UTC | #1
On 03/05/2014 05:53 PM, Takashi Iwai wrote:
> cs4271_common_probe() is called from cs4271_i2c_probe() but defined in
> CONFIG_SPI_MASTER block, thus it results in a build error when
> CONFIG_SPI_MASTER=n:
>   sound/soc/codecs/cs4271.c:721:2: error: implicit declaration of function ‘cs4271_common_probe’ [-Werror=implicit-function-declaration]
> 
> Move the function out of #if block.
> 
> Fixes: d6cf89ee07cb ('ASoC: cs4271: claim reset GPIO in bus probe function')
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Thanks!

Acked-by: Daniel Mack <daniel@zonque.org>

> ---
>  sound/soc/codecs/cs4271.c | 32 ++++++++++++++++----------------
>  1 file changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
> index 96c309777208..aef4965750c7 100644
> --- a/sound/soc/codecs/cs4271.c
> +++ b/sound/soc/codecs/cs4271.c
> @@ -612,22 +612,6 @@ static struct snd_soc_codec_driver soc_codec_dev_cs4271 = {
>  	.num_dapm_routes	= ARRAY_SIZE(cs4271_dapm_routes),
>  };
>  
> -#if defined(CONFIG_SPI_MASTER)
> -
> -static const struct regmap_config cs4271_spi_regmap = {
> -	.reg_bits = 16,
> -	.val_bits = 8,
> -	.max_register = CS4271_LASTREG,
> -	.read_flag_mask = 0x21,
> -	.write_flag_mask = 0x20,
> -
> -	.reg_defaults = cs4271_reg_defaults,
> -	.num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults),
> -	.cache_type = REGCACHE_RBTREE,
> -
> -	.volatile_reg = cs4271_volatile_reg,
> -};
> -
>  static int cs4271_common_probe(struct device *dev,
>  			       struct cs4271_private **c)
>  {
> @@ -658,6 +642,22 @@ static int cs4271_common_probe(struct device *dev,
>  	return 0;
>  }
>  
> +#if defined(CONFIG_SPI_MASTER)
> +
> +static const struct regmap_config cs4271_spi_regmap = {
> +	.reg_bits = 16,
> +	.val_bits = 8,
> +	.max_register = CS4271_LASTREG,
> +	.read_flag_mask = 0x21,
> +	.write_flag_mask = 0x20,
> +
> +	.reg_defaults = cs4271_reg_defaults,
> +	.num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults),
> +	.cache_type = REGCACHE_RBTREE,
> +
> +	.volatile_reg = cs4271_volatile_reg,
> +};
> +
>  static int cs4271_spi_probe(struct spi_device *spi)
>  {
>  	struct cs4271_private *cs4271;
>
Austin, Brian March 5, 2014, 5:03 p.m. UTC | #2
On Wed, 5 Mar 2014, Takashi Iwai wrote:

> cs4271_common_probe() is called from cs4271_i2c_probe() but defined in
> CONFIG_SPI_MASTER block, thus it results in a build error when
> CONFIG_SPI_MASTER=n:
>  sound/soc/codecs/cs4271.c:721:2: error: implicit declaration of function ‘cs4271_common_probe’ [-Werror=implicit-function-declaration]
>
> Move the function out of #if block.
>
> Fixes: d6cf89ee07cb ('ASoC: cs4271: claim reset GPIO in bus probe function')
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
Acked-by: Brian Austin <brian.austin@cirrus.com>
Mark Brown March 6, 2014, 4:31 a.m. UTC | #3
On Wed, Mar 05, 2014 at 05:53:31PM +0100, Takashi Iwai wrote:
> cs4271_common_probe() is called from cs4271_i2c_probe() but defined in
> CONFIG_SPI_MASTER block, thus it results in a build error when
> CONFIG_SPI_MASTER=n:
>   sound/soc/codecs/cs4271.c:721:2: error: implicit declaration of function ‘cs4271_common_probe’ [-Werror=implicit-function-declaration]

Applied, thanks.

Patch
diff mbox

diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 96c309777208..aef4965750c7 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -612,22 +612,6 @@  static struct snd_soc_codec_driver soc_codec_dev_cs4271 = {
 	.num_dapm_routes	= ARRAY_SIZE(cs4271_dapm_routes),
 };
 
-#if defined(CONFIG_SPI_MASTER)
-
-static const struct regmap_config cs4271_spi_regmap = {
-	.reg_bits = 16,
-	.val_bits = 8,
-	.max_register = CS4271_LASTREG,
-	.read_flag_mask = 0x21,
-	.write_flag_mask = 0x20,
-
-	.reg_defaults = cs4271_reg_defaults,
-	.num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults),
-	.cache_type = REGCACHE_RBTREE,
-
-	.volatile_reg = cs4271_volatile_reg,
-};
-
 static int cs4271_common_probe(struct device *dev,
 			       struct cs4271_private **c)
 {
@@ -658,6 +642,22 @@  static int cs4271_common_probe(struct device *dev,
 	return 0;
 }
 
+#if defined(CONFIG_SPI_MASTER)
+
+static const struct regmap_config cs4271_spi_regmap = {
+	.reg_bits = 16,
+	.val_bits = 8,
+	.max_register = CS4271_LASTREG,
+	.read_flag_mask = 0x21,
+	.write_flag_mask = 0x20,
+
+	.reg_defaults = cs4271_reg_defaults,
+	.num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults),
+	.cache_type = REGCACHE_RBTREE,
+
+	.volatile_reg = cs4271_volatile_reg,
+};
+
 static int cs4271_spi_probe(struct spi_device *spi)
 {
 	struct cs4271_private *cs4271;