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

Commit 5f345346 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Remove use of hw_read from TLV320AIC3x driver 



The TLV320AIC3x driver is currently the only user of the CODEC hw_read
operation and is jumping through some hoops in order to do so.  In order
to support future refactoring to make the hw_read operation more usable
unwrap the usage in this driver to avoid its use.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 1e30a582

sound/soc/codecs/tlv320aic3x.c

+2 −9
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static int aic3x_read(struct snd_soc_codec *codec, unsigned int reg, 
		      u8 *value)

{

	*value = reg & 0xff;

	if (codec->hw_read(codec->control_data, value, 1) != 1)

		return -EIO;



	value[0] = i2c_smbus_read_byte_data(codec->control_data, value[0]);



	aic3x_write_reg_cache(codec, reg, *value);

	return 0;
@@ -1316,12 +1316,6 @@ static struct i2c_driver aic3x_i2c_driver = { 
	.id_table = aic3x_i2c_id,

};



static int aic3x_i2c_read(struct i2c_client *client, u8 *value, int len)

{

	value[0] = i2c_smbus_read_byte_data(client, value[0]);

	return (len == 1);

}



static int aic3x_add_i2c_device(struct platform_device *pdev,

				 const struct aic3x_setup_data *setup)

{
@@ -1394,7 +1388,6 @@ static int aic3x_probe(struct platform_device *pdev) 
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

	if (setup->i2c_address) {

		codec->hw_write = (hw_write_t) i2c_master_send;

		codec->hw_read = (hw_read_t) aic3x_i2c_read;

		ret = aic3x_add_i2c_device(pdev, setup);

	}

#else