diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-05-31 08:21:13 -0400 |
---|---|---|
committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-07-04 11:44:02 -0400 |
commit | 4ae6df5e1018796ce260be59b2c603bd0f9faa94 (patch) | |
tree | 0a673e318826a51ce2660ed7e978eaa6e64fc6d6 /drivers/mfd/twl4030-audio.c | |
parent | 57fe7251f5bfc4332f24479376de48a1e8ca6211 (diff) |
MFD: twl4030-audio: Rename platform data
Allign the platform data names for twl4030 audio submodule:
twl4030_audio_data: for the core MFD driver
twl4030_codec_data: for ASoC codec driver
twl4030_vibra_data: for the input/ForceFeedback driver
To avoid breakage, change all depending drivers, files
to use the new types.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/twl4030-audio.c')
-rw-r--r-- | drivers/mfd/twl4030-audio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c index 5cdf84146799..ae51ab5d0e5d 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c | |||
@@ -159,7 +159,7 @@ EXPORT_SYMBOL_GPL(twl4030_audio_get_mclk); | |||
159 | static int __devinit twl4030_audio_probe(struct platform_device *pdev) | 159 | static int __devinit twl4030_audio_probe(struct platform_device *pdev) |
160 | { | 160 | { |
161 | struct twl4030_audio *audio; | 161 | struct twl4030_audio *audio; |
162 | struct twl4030_codec_data *pdata = pdev->dev.platform_data; | 162 | struct twl4030_audio_data *pdata = pdev->dev.platform_data; |
163 | struct mfd_cell *cell = NULL; | 163 | struct mfd_cell *cell = NULL; |
164 | int ret, childs = 0; | 164 | int ret, childs = 0; |
165 | u8 val; | 165 | u8 val; |
@@ -206,11 +206,11 @@ static int __devinit twl4030_audio_probe(struct platform_device *pdev) | |||
206 | audio->resource[TWL4030_AUDIO_RES_APLL].reg = TWL4030_REG_APLL_CTL; | 206 | audio->resource[TWL4030_AUDIO_RES_APLL].reg = TWL4030_REG_APLL_CTL; |
207 | audio->resource[TWL4030_AUDIO_RES_APLL].mask = TWL4030_APLL_EN; | 207 | audio->resource[TWL4030_AUDIO_RES_APLL].mask = TWL4030_APLL_EN; |
208 | 208 | ||
209 | if (pdata->audio) { | 209 | if (pdata->codec) { |
210 | cell = &audio->cells[childs]; | 210 | cell = &audio->cells[childs]; |
211 | cell->name = "twl4030-codec"; | 211 | cell->name = "twl4030-codec"; |
212 | cell->platform_data = pdata->audio; | 212 | cell->platform_data = pdata->codec; |
213 | cell->pdata_size = sizeof(*pdata->audio); | 213 | cell->pdata_size = sizeof(*pdata->codec); |
214 | childs++; | 214 | childs++; |
215 | } | 215 | } |
216 | if (pdata->vibra) { | 216 | if (pdata->vibra) { |