diff options
Diffstat (limited to 'sound/soc/s6000/s6000-i2s.c')
-rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index aaabdbaec19c..fee4d477a49c 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c | |||
@@ -436,7 +436,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { | |||
436 | .ops = &s6000_i2s_dai_ops, | 436 | .ops = &s6000_i2s_dai_ops, |
437 | }; | 437 | }; |
438 | 438 | ||
439 | static int __devinit s6000_i2s_probe(struct platform_device *pdev) | 439 | static int s6000_i2s_probe(struct platform_device *pdev) |
440 | { | 440 | { |
441 | struct s6000_i2s_dev *dev; | 441 | struct s6000_i2s_dev *dev; |
442 | struct resource *scbmem, *sifmem, *region, *dma1, *dma2; | 442 | struct resource *scbmem, *sifmem, *region, *dma1, *dma2; |
@@ -566,7 +566,7 @@ err_release_none: | |||
566 | return ret; | 566 | return ret; |
567 | } | 567 | } |
568 | 568 | ||
569 | static void __devexit s6000_i2s_remove(struct platform_device *pdev) | 569 | static void s6000_i2s_remove(struct platform_device *pdev) |
570 | { | 570 | { |
571 | struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev); | 571 | struct s6000_i2s_dev *dev = dev_get_drvdata(&pdev->dev); |
572 | struct resource *region; | 572 | struct resource *region; |
@@ -597,7 +597,7 @@ static void __devexit s6000_i2s_remove(struct platform_device *pdev) | |||
597 | 597 | ||
598 | static struct platform_driver s6000_i2s_driver = { | 598 | static struct platform_driver s6000_i2s_driver = { |
599 | .probe = s6000_i2s_probe, | 599 | .probe = s6000_i2s_probe, |
600 | .remove = __devexit_p(s6000_i2s_remove), | 600 | .remove = s6000_i2s_remove, |
601 | .driver = { | 601 | .driver = { |
602 | .name = "s6000-i2s", | 602 | .name = "s6000-i2s", |
603 | .owner = THIS_MODULE, | 603 | .owner = THIS_MODULE, |