diff options
Diffstat (limited to 'sound/soc/samsung/speyside.c')
| -rw-r--r-- | sound/soc/samsung/speyside.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index c7e1c28528a4..57df90d6b7c1 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c | |||
| @@ -198,7 +198,7 @@ static struct snd_soc_dai_link speyside_dai[] = { | |||
| 198 | .stream_name = "CPU-DSP", | 198 | .stream_name = "CPU-DSP", |
| 199 | .cpu_dai_name = "samsung-i2s.0", | 199 | .cpu_dai_name = "samsung-i2s.0", |
| 200 | .codec_dai_name = "wm0010-sdi1", | 200 | .codec_dai_name = "wm0010-sdi1", |
| 201 | .platform_name = "samsung-audio", | 201 | .platform_name = "samsung-i2s.0", |
| 202 | .codec_name = "spi0.0", | 202 | .codec_name = "spi0.0", |
| 203 | .init = speyside_wm0010_init, | 203 | .init = speyside_wm0010_init, |
| 204 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | 204 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
| @@ -320,7 +320,7 @@ static struct snd_soc_card speyside = { | |||
| 320 | .late_probe = speyside_late_probe, | 320 | .late_probe = speyside_late_probe, |
| 321 | }; | 321 | }; |
| 322 | 322 | ||
| 323 | static __devinit int speyside_probe(struct platform_device *pdev) | 323 | static int speyside_probe(struct platform_device *pdev) |
| 324 | { | 324 | { |
| 325 | struct snd_soc_card *card = &speyside; | 325 | struct snd_soc_card *card = &speyside; |
| 326 | int ret; | 326 | int ret; |
| @@ -337,7 +337,7 @@ static __devinit int speyside_probe(struct platform_device *pdev) | |||
| 337 | return 0; | 337 | return 0; |
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | static int __devexit speyside_remove(struct platform_device *pdev) | 340 | static int speyside_remove(struct platform_device *pdev) |
| 341 | { | 341 | { |
| 342 | struct snd_soc_card *card = platform_get_drvdata(pdev); | 342 | struct snd_soc_card *card = platform_get_drvdata(pdev); |
| 343 | 343 | ||
| @@ -353,7 +353,7 @@ static struct platform_driver speyside_driver = { | |||
| 353 | .pm = &snd_soc_pm_ops, | 353 | .pm = &snd_soc_pm_ops, |
| 354 | }, | 354 | }, |
| 355 | .probe = speyside_probe, | 355 | .probe = speyside_probe, |
| 356 | .remove = __devexit_p(speyside_remove), | 356 | .remove = speyside_remove, |
| 357 | }; | 357 | }; |
| 358 | 358 | ||
| 359 | module_platform_driver(speyside_driver); | 359 | module_platform_driver(speyside_driver); |
