diff options
Diffstat (limited to 'sound/soc/samsung/lowland.c')
-rw-r--r-- | sound/soc/samsung/lowland.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index 6abf341c4a2a..570cf5229508 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c | |||
@@ -99,7 +99,7 @@ static struct snd_soc_dai_link lowland_dai[] = { | |||
99 | .stream_name = "CPU", | 99 | .stream_name = "CPU", |
100 | .cpu_dai_name = "samsung-i2s.0", | 100 | .cpu_dai_name = "samsung-i2s.0", |
101 | .codec_dai_name = "wm5100-aif1", | 101 | .codec_dai_name = "wm5100-aif1", |
102 | .platform_name = "samsung-audio", | 102 | .platform_name = "samsung-i2s.0", |
103 | .codec_name = "wm5100.1-001a", | 103 | .codec_name = "wm5100.1-001a", |
104 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | 104 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | |
105 | SND_SOC_DAIFMT_CBM_CFM, | 105 | SND_SOC_DAIFMT_CBM_CFM, |
@@ -180,7 +180,7 @@ static struct snd_soc_card lowland = { | |||
180 | .num_dapm_routes = ARRAY_SIZE(audio_paths), | 180 | .num_dapm_routes = ARRAY_SIZE(audio_paths), |
181 | }; | 181 | }; |
182 | 182 | ||
183 | static __devinit int lowland_probe(struct platform_device *pdev) | 183 | static int lowland_probe(struct platform_device *pdev) |
184 | { | 184 | { |
185 | struct snd_soc_card *card = &lowland; | 185 | struct snd_soc_card *card = &lowland; |
186 | int ret; | 186 | int ret; |
@@ -197,7 +197,7 @@ static __devinit int lowland_probe(struct platform_device *pdev) | |||
197 | return 0; | 197 | return 0; |
198 | } | 198 | } |
199 | 199 | ||
200 | static int __devexit lowland_remove(struct platform_device *pdev) | 200 | static int lowland_remove(struct platform_device *pdev) |
201 | { | 201 | { |
202 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 202 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
203 | 203 | ||
@@ -213,7 +213,7 @@ static struct platform_driver lowland_driver = { | |||
213 | .pm = &snd_soc_pm_ops, | 213 | .pm = &snd_soc_pm_ops, |
214 | }, | 214 | }, |
215 | .probe = lowland_probe, | 215 | .probe = lowland_probe, |
216 | .remove = __devexit_p(lowland_remove), | 216 | .remove = lowland_remove, |
217 | }; | 217 | }; |
218 | 218 | ||
219 | module_platform_driver(lowland_driver); | 219 | module_platform_driver(lowland_driver); |