diff options
Diffstat (limited to 'sound/soc/codecs/twl4030.c')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 5e648d33d559..71674bec9604 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -297,7 +297,7 @@ static inline void twl4030_reset_registers(struct snd_soc_codec *codec) | |||
297 | 297 | ||
298 | static void twl4030_init_chip(struct snd_soc_codec *codec) | 298 | static void twl4030_init_chip(struct snd_soc_codec *codec) |
299 | { | 299 | { |
300 | struct twl4030_codec_audio_data *pdata = dev_get_platdata(codec->dev); | 300 | struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); |
301 | struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); | 301 | struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); |
302 | u8 reg, byte; | 302 | u8 reg, byte; |
303 | int i = 0; | 303 | int i = 0; |
@@ -732,7 +732,7 @@ static int aif_event(struct snd_soc_dapm_widget *w, | |||
732 | 732 | ||
733 | static void headset_ramp(struct snd_soc_codec *codec, int ramp) | 733 | static void headset_ramp(struct snd_soc_codec *codec, int ramp) |
734 | { | 734 | { |
735 | struct twl4030_codec_audio_data *pdata = codec->dev->platform_data; | 735 | struct twl4030_codec_data *pdata = codec->dev->platform_data; |
736 | unsigned char hs_gain, hs_pop; | 736 | unsigned char hs_gain, hs_pop; |
737 | struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); | 737 | struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); |
738 | /* Base values for ramp delay calculation: 2^19 - 2^26 */ | 738 | /* Base values for ramp delay calculation: 2^19 - 2^26 */ |
@@ -2297,7 +2297,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { | |||
2297 | 2297 | ||
2298 | static int __devinit twl4030_codec_probe(struct platform_device *pdev) | 2298 | static int __devinit twl4030_codec_probe(struct platform_device *pdev) |
2299 | { | 2299 | { |
2300 | struct twl4030_codec_audio_data *pdata = pdev->dev.platform_data; | 2300 | struct twl4030_codec_data *pdata = pdev->dev.platform_data; |
2301 | 2301 | ||
2302 | if (!pdata) { | 2302 | if (!pdata) { |
2303 | dev_err(&pdev->dev, "platform_data is missing\n"); | 2303 | dev_err(&pdev->dev, "platform_data is missing\n"); |