ASoC: cs4271: Fix build error without CONFIG_SPI_MASTER (9c369c6e) · Commits · 戴 / test

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: ('ASoC: cs4271: claim reset GPIO in bus probe function') Signed-off-by:

Takashi Iwai <tiwai@suse.de> Acked-by:

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

Brian Austin <brian.austin@cirrus.com> Signed-off-by:

Mark Brown <broonie@linaro.org>

sound/soc/codecs/cs4271.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -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;

Admin message