aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/tlv320aic26.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-20 02:20:31 -0400
committerTakashi Iwai <tiwai@suse.de>2010-04-20 02:29:19 -0400
commitd4a8ca246146099e9068fc87cd2bc565896bc186 (patch)
tree670d9890674e44bc9fa850b250d8ff5c1d5ddfdf /sound/soc/codecs/tlv320aic26.c
parentb2c812e22de88bb79c290c0e718280f10b64a48d (diff)
ASoC: missing conversions to snd_soc_codec_*_drvdata()
Conversions to snd_soc_codec_{get|set}_drvdata() were missing in some files in the previous commit. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/tlv320aic26.c')
-rw-r--r--sound/soc/codecs/tlv320aic26.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c
index 357b609196e3..5856f7aae4d9 100644
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
@@ -48,7 +48,7 @@ struct aic26 {
48static unsigned int aic26_reg_read(struct snd_soc_codec *codec, 48static unsigned int aic26_reg_read(struct snd_soc_codec *codec,
49 unsigned int reg) 49 unsigned int reg)
50{ 50{
51 struct aic26 *aic26 = codec->private_data; 51 struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
52 u16 *cache = codec->reg_cache; 52 u16 *cache = codec->reg_cache;
53 u16 cmd, value; 53 u16 cmd, value;
54 u8 buffer[2]; 54 u8 buffer[2];
@@ -92,7 +92,7 @@ static unsigned int aic26_reg_read_cache(struct snd_soc_codec *codec,
92static int aic26_reg_write(struct snd_soc_codec *codec, unsigned int reg, 92static int aic26_reg_write(struct snd_soc_codec *codec, unsigned int reg,
93 unsigned int value) 93 unsigned int value)
94{ 94{
95 struct aic26 *aic26 = codec->private_data; 95 struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
96 u16 *cache = codec->reg_cache; 96 u16 *cache = codec->reg_cache;
97 u16 cmd; 97 u16 cmd;
98 u8 buffer[4]; 98 u8 buffer[4];
@@ -131,7 +131,7 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,
131 struct snd_soc_pcm_runtime *rtd = substream->private_data; 131 struct snd_soc_pcm_runtime *rtd = substream->private_data;
132 struct snd_soc_device *socdev = rtd->socdev; 132 struct snd_soc_device *socdev = rtd->socdev;
133 struct snd_soc_codec *codec = socdev->card->codec; 133 struct snd_soc_codec *codec = socdev->card->codec;
134 struct aic26 *aic26 = codec->private_data; 134 struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
135 int fsref, divisor, wlen, pval, jval, dval, qval; 135 int fsref, divisor, wlen, pval, jval, dval, qval;
136 u16 reg; 136 u16 reg;
137 137
@@ -198,7 +198,7 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,
198static int aic26_mute(struct snd_soc_dai *dai, int mute) 198static int aic26_mute(struct snd_soc_dai *dai, int mute)
199{ 199{
200 struct snd_soc_codec *codec = dai->codec; 200 struct snd_soc_codec *codec = dai->codec;
201 struct aic26 *aic26 = codec->private_data; 201 struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
202 u16 reg = aic26_reg_read_cache(codec, AIC26_REG_DAC_GAIN); 202 u16 reg = aic26_reg_read_cache(codec, AIC26_REG_DAC_GAIN);
203 203
204 dev_dbg(&aic26->spi->dev, "aic26_mute(dai=%p, mute=%i)\n", 204 dev_dbg(&aic26->spi->dev, "aic26_mute(dai=%p, mute=%i)\n",
@@ -217,7 +217,7 @@ static int aic26_set_sysclk(struct snd_soc_dai *codec_dai,
217 int clk_id, unsigned int freq, int dir) 217 int clk_id, unsigned int freq, int dir)
218{ 218{
219 struct snd_soc_codec *codec = codec_dai->codec; 219 struct snd_soc_codec *codec = codec_dai->codec;
220 struct aic26 *aic26 = codec->private_data; 220 struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
221 221
222 dev_dbg(&aic26->spi->dev, "aic26_set_sysclk(dai=%p, clk_id==%i," 222 dev_dbg(&aic26->spi->dev, "aic26_set_sysclk(dai=%p, clk_id==%i,"
223 " freq=%i, dir=%i)\n", 223 " freq=%i, dir=%i)\n",
@@ -234,7 +234,7 @@ static int aic26_set_sysclk(struct snd_soc_dai *codec_dai,
234static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) 234static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
235{ 235{
236 struct snd_soc_codec *codec = codec_dai->codec; 236 struct snd_soc_codec *codec = codec_dai->codec;
237 struct aic26 *aic26 = codec->private_data; 237 struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
238 238
239 dev_dbg(&aic26->spi->dev, "aic26_set_fmt(dai=%p, fmt==%i)\n", 239 dev_dbg(&aic26->spi->dev, "aic26_set_fmt(dai=%p, fmt==%i)\n",
240 codec_dai, fmt); 240 codec_dai, fmt);
@@ -430,7 +430,7 @@ static int aic26_spi_probe(struct spi_device *spi)
430 /* Setup what we can in the codec structure so that the register 430 /* Setup what we can in the codec structure so that the register
431 * access functions will work as expected. More will be filled 431 * access functions will work as expected. More will be filled
432 * out when it is probed by the SoC CODEC part of this driver */ 432 * out when it is probed by the SoC CODEC part of this driver */
433 aic26->codec.private_data = aic26; 433 snd_soc_codec_set_drvdata(&aic26->codec, aic26);
434 aic26->codec.name = "aic26"; 434 aic26->codec.name = "aic26";
435 aic26->codec.owner = THIS_MODULE; 435 aic26->codec.owner = THIS_MODULE;
436 aic26->codec.dai = &aic26_dai; 436 aic26->codec.dai = &aic26_dai;