[PATCH 03/19] Code clean-up for sound/arm/omap/omap-alsa-aic23.c

[Eduardo Valentin <edubezval@gmail.com>]

From: Eduardo Valentin <eduardo.valentin@indt.org.br>

Removed lots of whitespaces and a few errors and
warnings reported by checkpatch.pl.

Signed-off-by: Eduardo Valentin <eduardo.valentin@indt.org.br>
---
 sound/arm/omap/omap-alsa-aic23.c |   59 ++++++++++++++++++++------------------
 sound/arm/omap/omap-alsa-aic23.h |    2 +
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/sound/arm/omap/omap-alsa-aic23.c b/sound/arm/omap/omap-alsa-aic23.c
index 4d67fa3..1e43608 100644
--- a/sound/arm/omap/omap-alsa-aic23.c
+++ b/sound/arm/omap/omap-alsa-aic23.c
@@ -1,6 +1,6 @@
 /*
  * arch/arm/mach-omap1/omap-alsa-aic23.c
- * 
+ *
  * Alsa codec Driver for AIC23 chip on OSK5912 platform board
  *
  * Copyright (C) 2005 Instituto Nokia de Tecnologia - INdT - Manaus Brazil
@@ -8,7 +8,7 @@
  *            {daniel.petrini, david.cohen, anderson.briglia}@indt.org.br
  *
  * Copyright (C) 2006 Mika Laitio <lamikr@cc.jyu.fi>
- * 
+ *
  * Based in former alsa driver for osk and oss driver
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 #include <asm/arch/omap-alsa.h>
 #include "omap-alsa-aic23.h"
 
-static struct clk *aic23_mclk = 0;
+static struct clk *aic23_mclk;
 
 /* aic23 related */
 static const struct aic23_samplerate_reg_info
@@ -48,7 +48,7 @@ static const struct aic23_samplerate_reg_info
 /*
  * Hardware capabilities
  */
- 
+
  /*
  * DAC USB-mode sampling rates (MCLK = 12 MHz)
  * The rates and rate_reg_into MUST be in the same order
@@ -67,7 +67,7 @@ static struct snd_pcm_hw_constraint_list aic23_hw_constraints_rates = {
 
 static struct snd_pcm_hardware aic23_snd_omap_alsa_playback = {
 	.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
-		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),	
+		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
 	.formats = (SNDRV_PCM_FMTBIT_S16_LE),
 	.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
 		  SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 |
@@ -112,8 +112,6 @@ static struct snd_pcm_hardware aic23_snd_omap_alsa_capture = {
  * codec dependent code.
  */
 
-extern int aic23_write_value(u8 reg, u16 value);
-
 /* TLV320AIC23 is a write only device */
 void audio_aic23_write(u8 address, u16 data)
 {
@@ -172,8 +170,12 @@ inline void aic23_configure(void)
 
 	/* Initialize the AIC23 internal state */
 
-	/* Analog audio path control, DAC selected, delete INSEL_MIC for line in */
-	audio_aic23_write(ANALOG_AUDIO_CONTROL_ADDR, DEFAULT_ANALOG_AUDIO_CONTROL);
+	/*
+	 * Analog audio path control, DAC selected,
+	 * delete INSEL_MIC for line-in
+	 */
+	audio_aic23_write(ANALOG_AUDIO_CONTROL_ADDR,
+				DEFAULT_ANALOG_AUDIO_CONTROL);
 
 	/* Digital audio path control, de-emphasis control 44.1kHz */
 	audio_aic23_write(DIGITAL_AUDIO_CONTROL_ADDR, DEEMP_44K);
@@ -191,11 +193,11 @@ inline void aic23_configure(void)
 }
 
 /*
- *  Omap MCBSP clock configuration and Power Management
- *  
- *  Here we have some functions that allows clock to be enabled and
- *   disabled only when needed. Besides doing clock configuration 
- *   it allows turn on/turn off audio when necessary. 
+ *  OMAP MCBSP clock configuration and Power Management
+ *
+ *  Here we have some functions that allow clock to be enabled and
+ *   disabled only when needed. Besides doing clock configuration
+ *   it allows turn on/turn off audio when necessary.
  */
 /*
  * Do clock framework mclk search
@@ -207,7 +209,7 @@ void aic23_clock_setup(void)
 
 /*
  * Do some sanity check, set clock rate, starts it and
- *  turn codec audio on 
+ *  turn codec audio on
  */
 int aic23_clock_on(void)
 {
@@ -236,9 +238,9 @@ int aic23_clock_on(void)
 	       clk_get_usecount(aic23_mclk));
 
 	/* Now turn the audio on */
-	audio_aic23_write(POWER_DOWN_CONTROL_ADDR, 
+	audio_aic23_write(POWER_DOWN_CONTROL_ADDR,
 			  ~DEVICE_POWER_OFF & ~OUT_OFF & ~DAC_OFF &
-			  ~ADC_OFF & ~MIC_OFF & ~LINE_OFF);	
+			  ~ADC_OFF & ~MIC_OFF & ~LINE_OFF);
 	return 0;
 }
 
@@ -248,7 +250,7 @@ int aic23_clock_on(void)
  */
 int aic23_clock_off(void)
 {
-	if  (clk_get_usecount(aic23_mclk) > 0) { 
+	if (clk_get_usecount(aic23_mclk) > 0) {
 		if (clk_get_rate(aic23_mclk) != CODEC_CLOCK) {
 			printk(KERN_WARNING
 			       "MCLK for audio should be %d Hz. But is %d Hz\n",
@@ -258,10 +260,10 @@ int aic23_clock_off(void)
 
 		clk_disable(aic23_mclk);
 	}
-	
+
 	audio_aic23_write(POWER_DOWN_CONTROL_ADDR,
 			  DEVICE_POWER_OFF | OUT_OFF | DAC_OFF |
-			  ADC_OFF | MIC_OFF | LINE_OFF);	
+			  ADC_OFF | MIC_OFF | LINE_OFF);
 	return 0;
 }
 
@@ -274,21 +276,22 @@ static int __devinit snd_omap_alsa_aic23_probe(struct platform_device *pdev)
 {
 	int	ret;
 	struct	omap_alsa_codec_config *codec_cfg;
-	
+
 	codec_cfg = pdev->dev.platform_data;
 	if (codec_cfg != NULL) {
 		codec_cfg->hw_constraints_rates	= &aic23_hw_constraints_rates;
-		codec_cfg->snd_omap_alsa_playback  = &aic23_snd_omap_alsa_playback;
-		codec_cfg->snd_omap_alsa_capture  = &aic23_snd_omap_alsa_capture;		
+		codec_cfg->snd_omap_alsa_playback =
+						&aic23_snd_omap_alsa_playback;
+		codec_cfg->snd_omap_alsa_capture = &aic23_snd_omap_alsa_capture;
 		codec_cfg->codec_configure_dev	= aic23_configure;
 		codec_cfg->codec_set_samplerate	= aic23_set_samplerate;
 		codec_cfg->codec_clock_setup	= aic23_clock_setup;
 		codec_cfg->codec_clock_on	= aic23_clock_on;
 		codec_cfg->codec_clock_off	= aic23_clock_off;
-		codec_cfg->get_default_samplerate = aic23_get_default_samplerate;
+		codec_cfg->get_default_samplerate =
+						aic23_get_default_samplerate;
 		ret	= snd_omap_alsa_post_probe(pdev, codec_cfg);
-	}
-	else
+	} else
 		ret = -ENODEV;
 	return ret;
 }
@@ -306,7 +309,7 @@ static struct platform_driver omap_alsa_driver = {
 static int __init omap_alsa_aic23_init(void)
 {
 	int err;
-	
+
 	ADEBUG();
 	err = platform_driver_register(&omap_alsa_driver);
 
@@ -316,7 +319,7 @@ static int __init omap_alsa_aic23_init(void)
 static void __exit omap_alsa_aic23_exit(void)
 {
 	ADEBUG();
-	
+
 	platform_driver_unregister(&omap_alsa_driver);
 }
 
diff --git a/sound/arm/omap/omap-alsa-aic23.h b/sound/arm/omap/omap-alsa-aic23.h
index e2e2d59..8b11a69 100644
--- a/sound/arm/omap/omap-alsa-aic23.h
+++ b/sound/arm/omap/omap-alsa-aic23.h
@@ -67,6 +67,8 @@ struct aic23_samplerate_reg_info {
 	u8 divider;		/* if 0 CLKIN = MCLK, if 1 CLKIN = MCLK/2 */
 };
 
+extern int aic23_write_value(u8 reg, u16 value);
+
 /*
  * Defines codec specific functions pointers that can be used from the 
  * common omap-alse base driver for all omap codecs. (tsc2101 and aic23)
-- 
1.5.5-rc3.GIT