diff options
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, | |||
145 | u8 *value) | 145 | u8 *value) |
146 | { | 146 | { |
147 | *value = reg & 0xff; | 147 | *value = reg & 0xff; |
148 | if (codec->hw_read(codec->control_data, value, 1) != 1) | 148 | |
149 | return -EIO; | 149 | value[0] = i2c_smbus_read_byte_data(codec->control_data, value[0]); |
150 | 150 | ||
151 | aic3x_write_reg_cache(codec, reg, *value); | 151 | aic3x_write_reg_cache(codec, reg, *value); |
152 | return 0; | 152 | return 0; |
@@ -1325,12 +1325,6 @@ static struct i2c_driver aic3x_i2c_driver = { | |||
1325 | .id_table = aic3x_i2c_id, | 1325 | .id_table = aic3x_i2c_id, |
1326 | }; | 1326 | }; |
1327 | 1327 | ||
1328 | static int aic3x_i2c_read(struct i2c_client *client, u8 *value, int len) | ||
1329 | { | ||
1330 | value[0] = i2c_smbus_read_byte_data(client, value[0]); | ||
1331 | return (len == 1); | ||
1332 | } | ||
1333 | |||
1334 | static int aic3x_add_i2c_device(struct platform_device *pdev, | 1328 | static int aic3x_add_i2c_device(struct platform_device *pdev, |
1335 | const struct aic3x_setup_data *setup) | 1329 | const struct aic3x_setup_data *setup) |
1336 | { | 1330 | { |
@@ -1403,7 +1397,6 @@ static int aic3x_probe(struct platform_device *pdev) | |||
1403 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 1397 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
1404 | if (setup->i2c_address) { | 1398 | if (setup->i2c_address) { |
1405 | codec->hw_write = (hw_write_t) i2c_master_send; | 1399 | codec->hw_write = (hw_write_t) i2c_master_send; |
1406 | codec->hw_read = (hw_read_t) aic3x_i2c_read; | ||
1407 | ret = aic3x_add_i2c_device(pdev, setup); | 1400 | ret = aic3x_add_i2c_device(pdev, setup); |
1408 | } | 1401 | } |
1409 | #else | 1402 | #else |