aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-23 14:43:07 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-24 05:41:27 -0400
commit591796b82ab04c01179b9f47b1159051aeb66f08 (patch)
treec8009f9f3d5561b891943dabf28047f0a7250648
parent8d85d7414a681ad17f6bfc7564e310caee2c868d (diff)
ASoC: Clean up AC'97 glue driver
Remove version number and clean up some indentation. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--sound/soc/codecs/ac97.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c
index 12c87d37eba1..2c824a588756 100644
--- a/sound/soc/codecs/ac97.c
+++ b/sound/soc/codecs/ac97.c
@@ -22,8 +22,6 @@
22#include <sound/initval.h> 22#include <sound/initval.h>
23#include <sound/soc.h> 23#include <sound/soc.h>
24 24
25#define AC97_VERSION "0.6"
26
27static int ac97_prepare(struct snd_pcm_substream *substream, 25static int ac97_prepare(struct snd_pcm_substream *substream,
28 struct snd_soc_dai *dai) 26 struct snd_soc_dai *dai)
29{ 27{
@@ -81,11 +79,9 @@ static int ac97_soc_probe(struct snd_soc_codec *codec)
81 struct snd_ac97_template ac97_template; 79 struct snd_ac97_template ac97_template;
82 int ret; 80 int ret;
83 81
84 printk(KERN_INFO "AC97 SoC Audio Codec %s\n", AC97_VERSION);
85
86 ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); 82 ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0);
87 if (ret < 0) { 83 if (ret < 0) {
88 printk(KERN_ERR "ASoC: failed to init gen ac97 glue\n"); 84 printk(KERN_ERR "ASoC: failed to init generic ac97 glue\n");
89 return ret; 85 return ret;
90 } 86 }
91 87
@@ -127,8 +123,8 @@ static int ac97_soc_resume(struct snd_soc_codec *codec)
127#endif 123#endif
128 124
129static struct snd_soc_codec_driver soc_codec_dev_ac97 = { 125static struct snd_soc_codec_driver soc_codec_dev_ac97 = {
130 .write = ac97_write, 126 .write = ac97_write,
131 .read = ac97_read, 127 .read = ac97_read,
132 .probe = ac97_soc_probe, 128 .probe = ac97_soc_probe,
133 .remove = ac97_soc_remove, 129 .remove = ac97_soc_remove,
134 .suspend = ac97_soc_suspend, 130 .suspend = ac97_soc_suspend,
@@ -149,8 +145,8 @@ static int __devexit ac97_remove(struct platform_device *pdev)
149 145
150static struct platform_driver ac97_codec_driver = { 146static struct platform_driver ac97_codec_driver = {
151 .driver = { 147 .driver = {
152 .name = "ac97-codec", 148 .name = "ac97-codec",
153 .owner = THIS_MODULE, 149 .owner = THIS_MODULE,
154 }, 150 },
155 151
156 .probe = ac97_probe, 152 .probe = ac97_probe,