diff options
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/gtm601.c | 6 | ||||
| -rw-r--r-- | sound/soc/codecs/w2cbw003-bt.c | 6 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-audio.c | 3 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-headset.c | 1 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-voice.c | 1 |
5 files changed, 6 insertions, 11 deletions
diff --git a/sound/soc/codecs/gtm601.c b/sound/soc/codecs/gtm601.c index 6c5edbe..289b25d 100644 --- a/sound/soc/codecs/gtm601.c +++ b/sound/soc/codecs/gtm601.c @@ -56,13 +56,13 @@ struct snd_soc_dai_driver gtm601_dai = { struct snd_soc_codec_driver soc_codec_dev_gtm601; -static __devinit int gtm601_platform_probe(struct platform_device *pdev) +static int gtm601_platform_probe(struct platform_device *pdev) { return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_gtm601, >m601_dai, 1); } -static int __devexit gtm601_platform_remove(struct platform_device *pdev) +static int gtm601_platform_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); return 0; @@ -77,7 +77,7 @@ static struct platform_driver gtm601_codec_driver = { }, .probe = gtm601_platform_probe, - .remove = __devexit_p(gtm601_platform_remove), + .remove = gtm601_platform_remove, }; static int __init gtm601_init(void) diff --git a/sound/soc/codecs/w2cbw003-bt.c b/sound/soc/codecs/w2cbw003-bt.c index f2cd41e..b472503 100644 --- a/sound/soc/codecs/w2cbw003-bt.c +++ b/sound/soc/codecs/w2cbw003-bt.c @@ -61,13 +61,13 @@ struct snd_soc_dai_driver w2cbw003_dai = { struct snd_soc_codec_driver soc_codec_dev_w2cbw003; -static __devinit int w2cbw003_platform_probe(struct platform_device *pdev) +static int w2cbw003_platform_probe(struct platform_device *pdev) { return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_w2cbw003, &w2cbw003_dai, 1); } -static int __devexit w2cbw003_platform_remove(struct platform_device *pdev) +static int w2cbw003_platform_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); return 0; @@ -82,7 +82,7 @@ static struct platform_driver w2cbw003_codec_driver = { }, .probe = w2cbw003_platform_probe, - .remove = __devexit_p(w2cbw003_platform_remove), + .remove = w2cbw003_platform_remove, }; static int __init w2cbw003_init(void) diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c index 83fb150..86d4d8a 100644 --- a/sound/soc/omap/gta04-audio.c +++ b/sound/soc/omap/gta04-audio.c @@ -31,13 +31,10 @@ #include <sound/soc-dapm.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> #include <linux/i2c/twl4030-madc.h> #include "omap-mcbsp.h" -#include "omap-pcm.h" #include "../codecs/twl4030.h" static int omap3gta04_hw_params(struct snd_pcm_substream *substream, diff --git a/sound/soc/omap/gta04-headset.c b/sound/soc/omap/gta04-headset.c index d266492..61162ab 100644 --- a/sound/soc/omap/gta04-headset.c +++ b/sound/soc/omap/gta04-headset.c @@ -24,7 +24,6 @@ #include <sound/soc-dapm.h> #include "omap-mcbsp.h" -#include "omap-pcm.h" #include "../codecs/w2cbw003-bt.h" static int gta04_headset_hw_params(struct snd_pcm_substream *substream, diff --git a/sound/soc/omap/gta04-voice.c b/sound/soc/omap/gta04-voice.c index c2c7619..bb54381 100644 --- a/sound/soc/omap/gta04-voice.c +++ b/sound/soc/omap/gta04-voice.c @@ -24,7 +24,6 @@ #include <sound/soc-dapm.h> #include "omap-mcbsp.h" -#include "omap-pcm.h" #include "../codecs/gtm601.h" static int gta04_voice_hw_params(struct snd_pcm_substream *substream, |