Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a1212a8 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove snd_soc_bulk_write_raw() 



No users of snd_soc_bulk_write_raw() are left and new drivers are going to use
regmap directly for this, so the function can be removed.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 175ee39e

include/sound/soc.h

+0 −3
Original line number Diff line number Diff line
@@ -686,7 +686,6 @@ struct snd_soc_codec { 
	unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);

	unsigned int (*read)(struct snd_soc_codec *, unsigned int);

	int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);

	int (*bulk_write_raw)(struct snd_soc_codec *, unsigned int, const void *, size_t);

	void *reg_cache;

	const void *reg_def_copy;

	const struct snd_soc_cache_ops *cache_ops;
@@ -1097,8 +1096,6 @@ struct soc_enum { 
unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);

unsigned int snd_soc_write(struct snd_soc_codec *codec,

			   unsigned int reg, unsigned int val);

unsigned int snd_soc_bulk_write_raw(struct snd_soc_codec *codec,

				    unsigned int reg, const void *data, size_t len);



/* device driver data */

sound/soc/soc-core.c

+0 −7
Original line number Diff line number Diff line
@@ -2298,13 +2298,6 @@ unsigned int snd_soc_write(struct snd_soc_codec *codec, 
}

EXPORT_SYMBOL_GPL(snd_soc_write);



unsigned int snd_soc_bulk_write_raw(struct snd_soc_codec *codec,

				    unsigned int reg, const void *data, size_t len)

{

	return codec->bulk_write_raw(codec, reg, data, len);

}

EXPORT_SYMBOL_GPL(snd_soc_bulk_write_raw);



/**

 * snd_soc_update_bits - update codec register bits

 * @codec: audio codec

sound/soc/soc-io.c

+0 −26
Original line number Diff line number Diff line
@@ -65,31 +65,6 @@ static unsigned int hw_read(struct snd_soc_codec *codec, unsigned int reg) 
	return val;

}



/* Primitive bulk write support for soc-cache.  The data pointed to by

 * `data' needs to already be in the form the hardware expects.  Any

 * data written through this function will not go through the cache as

 * it only handles writing to volatile or out of bounds registers.

 *

 * This is currently only supported for devices using the regmap API

 * wrappers.

 */

static int snd_soc_hw_bulk_write_raw(struct snd_soc_codec *codec,

				     unsigned int reg,

				     const void *data, size_t len)

{

	/* To ensure that we don't get out of sync with the cache, check

	 * whether the base register is volatile or if we've directly asked

	 * to bypass the cache.  Out of bounds registers are considered

	 * volatile.

	 */

	if (!codec->cache_bypass

	    && !snd_soc_codec_volatile_register(codec, reg)

	    && reg < codec->driver->reg_cache_size)

		return -EINVAL;



	return regmap_raw_write(codec->control_data, reg, data, len);

}



/**

 * snd_soc_codec_set_cache_io: Set up standard I/O functions.

 *
@@ -119,7 +94,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, 
	memset(&config, 0, sizeof(config));

	codec->write = hw_write;

	codec->read = hw_read;

	codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;



	config.reg_bits = addr_bits;

	config.val_bits = data_bits;