diff options
| author | Arun KS <arunks@mistralsolutions.com> | 2008-10-13 06:17:25 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-13 08:52:50 -0400 |
| commit | 4aa02396f934b355a4002ea9bc524aa42d6b53d6 (patch) | |
| tree | aeb208e6171227fd39f733e97f82d03fd292413a | |
| parent | a7e54e6de3b01d9085202fdbf0110da425f4af38 (diff) | |
ALSA: ASoC: Fix compile-time warning for tlv320aic23.c
Fixes this warning:
sound/soc/codecs/tlv320aic23.c: In function 'tlv320aic23_write':
sound/soc/codecs/tlv320aic23.c:104: warning: passing argument 2 of
'codec->hw_write' makes pointer from integer without a cast
Replaces i2c smbus write function with standard i2c write function
Signed-off-by: Arun KS <arunks@mistralsolutions.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/soc/codecs/tlv320aic23.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index bac7815e00fb..44308dac9e18 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c | |||
| @@ -84,7 +84,7 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg, | |||
| 84 | unsigned int value) | 84 | unsigned int value) |
| 85 | { | 85 | { |
| 86 | 86 | ||
| 87 | u8 data; | 87 | u8 data[2]; |
| 88 | 88 | ||
| 89 | /* TLV320AIC23 has 7 bit address and 9 bits of data | 89 | /* TLV320AIC23 has 7 bit address and 9 bits of data |
| 90 | * so we need to switch one data bit into reg and rest | 90 | * so we need to switch one data bit into reg and rest |
| @@ -96,12 +96,12 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg, | |||
| 96 | return -1; | 96 | return -1; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | data = (reg << 1) | (value >> 8 & 0x01); | 99 | data[0] = (reg << 1) | (value >> 8 & 0x01); |
| 100 | data[1] = value & 0xff; | ||
| 100 | 101 | ||
| 101 | tlv320aic23_write_reg_cache(codec, reg, value); | 102 | tlv320aic23_write_reg_cache(codec, reg, value); |
| 102 | 103 | ||
| 103 | if (codec->hw_write(codec->control_data, data, | 104 | if (codec->hw_write(codec->control_data, data, 2) == 2) |
| 104 | (value & 0xff)) == 0) | ||
| 105 | return 0; | 105 | return 0; |
| 106 | 106 | ||
| 107 | printk(KERN_ERR "%s cannot write %03x to register R%d\n", __func__, | 107 | printk(KERN_ERR "%s cannot write %03x to register R%d\n", __func__, |
| @@ -674,7 +674,7 @@ static int tlv320aic23_probe(struct platform_device *pdev) | |||
| 674 | 674 | ||
| 675 | tlv320aic23_socdev = socdev; | 675 | tlv320aic23_socdev = socdev; |
| 676 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 676 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
| 677 | codec->hw_write = (hw_write_t) i2c_smbus_write_byte_data; | 677 | codec->hw_write = (hw_write_t) i2c_master_send; |
| 678 | codec->hw_read = NULL; | 678 | codec->hw_read = NULL; |
| 679 | ret = i2c_add_driver(&tlv320aic23_i2c_driver); | 679 | ret = i2c_add_driver(&tlv320aic23_i2c_driver); |
| 680 | if (ret != 0) | 680 | if (ret != 0) |
