diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-07 11:43:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-07 11:43:58 +0100 |
| commit | 06cddefc1f25b847dafe392f3d5781482b3395b5 (patch) | |
| tree | 97f4df2e4ae6a1e8194ca67ede1b552802ba2334 /sound/soc/codecs/tlv320aic3x.c | |
| parent | b9b5cc26d0b3a9b361cc56c3a3b0d6f819b9195f (diff) | |
| parent | 27ded041f03026e8c6be9efc626e11ddfb4620c1 (diff) | |
| download | linux-06cddefc1f25b847dafe392f3d5781482b3395b5.tar.gz linux-06cddefc1f25b847dafe392f3d5781482b3395b5.tar.bz2 linux-06cddefc1f25b847dafe392f3d5781482b3395b5.zip | |
Merge branch 'reg-cache' into for-2.6.32
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index cb0d1bf34b57..126b15b18aeb 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -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; @@ -1325,12 +1325,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) { @@ -1403,7 +1397,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 |