[PATCH 0/4] small fixes during code reading

[PATCH 0/4] small fixes during code reading

[Lu Guanqun]

The following patches are fixed during my own code reading.
These are quite trivial, most are style fixes.

These patches are based on Mark Brown's for-2.6.40 branch.

---

Lu Guanqun (4):
      ASoC: fix a simple coding style issue
      ASoC: remove unused comment
      ASoC: simple style fix
      ASoC: fix two ident style problems


 include/sound/soc-dapm.h |    2 +-
 sound/soc/soc-cache.c    |    1 -
 sound/soc/soc-core.c     |    4 ++--
 sound/soc/soc-dapm.c     |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

-- 
guanqun

[PATCH 1/4] ASoC: fix a simple coding style issue

[Lu Guanqun]

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
---
 sound/soc/soc-dapm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 2ee738c..2fa2442 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1597,7 +1597,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,
 	}
 
 	/* connect dynamic paths */
-	switch(wsink->id) {
+	switch (wsink->id) {
 	case snd_soc_dapm_adc:
 	case snd_soc_dapm_dac:
 	case snd_soc_dapm_pga:

[PATCH 2/4] ASoC: remove unused comment

[Lu Guanqun]

`type` parameter is not longer used in `snd_soc_codec_set_cache_io`,
so remove this line.

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
---
 sound/soc/soc-cache.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index f46a198..a217db2 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -484,7 +484,6 @@ static struct {
  * snd_soc_codec_set_cache_io: Set up standard I/O functions.
  *
  * @codec: CODEC to configure.
- * @type: Type of cache.
  * @addr_bits: Number of bits of register address data.
  * @data_bits: Number of bits of data per register.
  * @control: Control bus used.

[PATCH 3/4] ASoC: simple style fix

[Lu Guanqun]

replace the tab with spaces,
make it align with other paragraphs

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
---
 include/sound/soc-dapm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index f72c103..d5f1b9a 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -24,7 +24,7 @@
  * SoC dynamic audio power management
  *
  * We can have up to 4 power domains
- * 	1. Codec domain - VREF, VMID
+ *  1. Codec domain - VREF, VMID
  *     Usually controlled at codec probe/remove, although can be set
  *     at stream time if power is not needed for sidetone, etc.
  *  2. Platform/Machine domain - physically connected inputs and outputs

[PATCH 4/4] ASoC: fix two ident style problems

[Lu Guanqun]

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
---
 sound/soc/soc-core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3b3a377d..a6f37d4 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3475,7 +3475,7 @@ int snd_soc_register_dai(struct device *dev,
 
 	dai = kzalloc(sizeof(struct snd_soc_dai), GFP_KERNEL);
 	if (dai == NULL)
-			return -ENOMEM;
+		return -ENOMEM;
 
 	/* create DAI component name */
 	dai->name = fmt_single_name(dev, &dai->id);
@@ -3614,7 +3614,7 @@ int snd_soc_register_platform(struct device *dev,
 
 	platform = kzalloc(sizeof(struct snd_soc_platform), GFP_KERNEL);
 	if (platform == NULL)
-			return -ENOMEM;
+		return -ENOMEM;
 
 	/* create platform component name */
 	platform->name = fmt_single_name(dev, &platform->id);

Re: [PATCH 4/4] ASoC: fix two ident style problems

[Paul Menzel]

[-- Attachment #1.1: Type: text/plain, Size: 211 bytes --]

Am Mittwoch, den 20.04.2011, 16:00 +0800 schrieb Lu Guanqun:

Mark, please fix `s/ident/indent/` when applying the patches.

> Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>

[…]


Thanks,

Paul

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/4] ASoC: fix a simple coding style issue

[Mark Brown]

On Wed, Apr 20, 2011 at 04:00:36PM +0800, Lu Guanqun wrote:
> Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>

Applied all, thanks.