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