All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Mack <daniel@zonque.org>
To: Takashi Iwai <tiwai@suse.de>, Mark Brown <broonie@kernel.org>
Cc: Brian Austin <brian.austin@cirrus.com>,
	alsa-devel@alsa-project.org,
	Paul Handrigan <Paul.Handrigan@cirrus.com>,
	Liam Girdwood <lgirdwood@gmail.com>
Subject: Re: [PATCH] ASoC: cs4271: Fix build error without CONFIG_SPI_MASTER
Date: Wed, 05 Mar 2014 18:03:16 +0100	[thread overview]
Message-ID: <531758D4.8000008@zonque.org> (raw)
In-Reply-To: <1394038411-11045-1-git-send-email-tiwai@suse.de>

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;
> 

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  reply	other threads:[~2014-03-05 17:03 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-05 16:53 [PATCH] ASoC: cs4271: Fix build error without CONFIG_SPI_MASTER Takashi Iwai
2014-03-05 17:03 ` Daniel Mack [this message]
2014-03-05 17:03 ` Brian Austin
2014-03-06  4:31 ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=531758D4.8000008@zonque.org \
    --to=daniel@zonque.org \
    --cc=Paul.Handrigan@cirrus.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=brian.austin@cirrus.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.