aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/twl4030.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index e4d464b937d6..8512800f6326 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -26,6 +26,7 @@
26#include <linux/pm.h> 26#include <linux/pm.h>
27#include <linux/i2c.h> 27#include <linux/i2c.h>
28#include <linux/platform_device.h> 28#include <linux/platform_device.h>
29#include <linux/mfd/core.h>
29#include <linux/i2c/twl.h> 30#include <linux/i2c/twl.h>
30#include <linux/slab.h> 31#include <linux/slab.h>
31#include <sound/core.h> 32#include <sound/core.h>
@@ -732,7 +733,8 @@ static int aif_event(struct snd_soc_dapm_widget *w,
732 733
733static void headset_ramp(struct snd_soc_codec *codec, int ramp) 734static void headset_ramp(struct snd_soc_codec *codec, int ramp)
734{ 735{
735 struct twl4030_codec_audio_data *pdata = codec->dev->platform_data; 736 struct twl4030_codec_audio_data *pdata =
737 mfd_get_data(to_platform_device(codec->dev));
736 unsigned char hs_gain, hs_pop; 738 unsigned char hs_gain, hs_pop;
737 struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); 739 struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
738 /* Base values for ramp delay calculation: 2^19 - 2^26 */ 740 /* Base values for ramp delay calculation: 2^19 - 2^26 */
@@ -2297,7 +2299,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
2297 2299
2298static int __devinit twl4030_codec_probe(struct platform_device *pdev) 2300static int __devinit twl4030_codec_probe(struct platform_device *pdev)
2299{ 2301{
2300 struct twl4030_codec_audio_data *pdata = pdev->dev.platform_data; 2302 struct twl4030_codec_audio_data *pdata = mfd_get_data(pdev);
2301 2303
2302 if (!pdata) { 2304 if (!pdata) {
2303 dev_err(&pdev->dev, "platform_data is missing\n"); 2305 dev_err(&pdev->dev, "platform_data is missing\n");