aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2013-02-18 22:59:35 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-03 22:20:15 -0500
commit06d7c13325228a2272e21caa4aa60805bc4d0fe4 (patch)
tree6dbff1d069386be864c1346789cff2df8263233e
parentd686500ae87275ed58a074f9e5e8b35b9afe30d8 (diff)
ASoC: si476x: Cosmetic changes to SI476X codec driver
- Add appropriate license header - Change email address in MODULE_AUTHOR - Remove trailing whitespaces Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/si476x.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c
index 30aebbe6815e..68b648aabdb9 100644
--- a/sound/soc/codecs/si476x.c
+++ b/sound/soc/codecs/si476x.c
@@ -1,3 +1,22 @@
1/*
2 * sound/soc/codecs/si476x.c -- Codec driver for SI476X chips
3 *
4 * Copyright (C) 2012 Innovative Converged Devices(ICD)
5 * Copyright (C) 2013 Andrey Smirnov
6 *
7 * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; version 2 of the License.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * General Public License for more details.
17 *
18 */
19
1#include <linux/module.h> 20#include <linux/module.h>
2#include <linux/slab.h> 21#include <linux/slab.h>
3#include <sound/pcm.h> 22#include <sound/pcm.h>
@@ -156,7 +175,7 @@ static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai,
156 dev_err(codec_dai->codec->dev, "Failed to set output format\n"); 175 dev_err(codec_dai->codec->dev, "Failed to set output format\n");
157 return err; 176 return err;
158 } 177 }
159 178
160 return 0; 179 return 0;
161} 180}
162 181
@@ -197,7 +216,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream,
197 216
198 err = snd_soc_update_bits(dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT, 217 err = snd_soc_update_bits(dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT,
199 SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK, 218 SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK,
200 (width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) | 219 (width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) |
201 (width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT)); 220 (width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT));
202 if (err < 0) { 221 if (err < 0) {
203 dev_err(dai->codec->dev, "Failed to set output width\n"); 222 dev_err(dai->codec->dev, "Failed to set output width\n");
@@ -266,6 +285,6 @@ static struct platform_driver si476x_platform_driver = {
266}; 285};
267module_platform_driver(si476x_platform_driver); 286module_platform_driver(si476x_platform_driver);
268 287
269MODULE_AUTHOR("Andrey Smirnov <andrey.smirnov@convergeddevices.net>"); 288MODULE_AUTHOR("Andrey Smirnov <andrew.smirnov@gmail.com>");
270MODULE_DESCRIPTION("ASoC Si4761/64 codec driver"); 289MODULE_DESCRIPTION("ASoC Si4761/64 codec driver");
271MODULE_LICENSE("GPL"); 290MODULE_LICENSE("GPL");