Skip to content

L
linux-davinci
Commit c1550869 authored by Eduardo Valentin's avatar Eduardo Valentin Committed by Tony Lindgren
Browse files
Options

Code clean-up for sound/arm/omap/omap-alsa-tsc2102.c 

Removed lots of whitespaces and a few errors and
warnings reported by checkpatch.pl.
Signed-off-by: default avatarEduardo Valentin <eduardo.valentin@indt.org.br>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f849ecb7
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
sound/arm/omap/omap-alsa-tsc2102.c
View file @ c1550869
/* /*
* sound/arm/omap/omap-alsa-tsc2102.c * sound/arm/omap/omap-alsa-tsc2102.c
* *
* Alsa codec driver for TSC2102 chip for OMAP platforms. * Alsa codec driver for TSC2102 chip for OMAP platforms.
* *
* Copyright (c) 2006 Andrzej Zaborowski <balrog@zabor.org> * Copyright (c) 2006 Andrzej Zaborowski <balrog@zabor.org>
...@@ -17,17 +17,16 @@ ...@@ -17,17 +17,16 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/io.h>
#include <linux/spi/tsc2102.h> #include <linux/spi/tsc2102.h>
#include <asm/io.h>
#include <asm/arch/dma.h> #include <asm/arch/dma.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/omap-alsa.h> #include <asm/arch/omap-alsa.h>
#include "omap-alsa-tsc2102.h" #include "omap-alsa-tsc2102.h"
static struct clk *tsc2102_bclk = 0; static struct clk *tsc2102_bclk;
/* /*
* Hardware capabilities * Hardware capabilities
...@@ -67,62 +66,63 @@ static struct snd_pcm_hardware tsc2102_snd_omap_alsa_playback = { ...@@ -67,62 +66,63 @@ static struct snd_pcm_hardware tsc2102_snd_omap_alsa_playback = {
}; };
#ifdef DUMP_TSC2102_AUDIO_REGISTERS #ifdef DUMP_TSC2102_AUDIO_REGISTERS
static void dump_tsc2102_audio_regs(void) { static void dump_tsc2102_audio_regs(void)
printk("TSC2102_AUDIO1_CTRL = 0x%04x\n", {
printk(KERN_INFO "TSC2102_AUDIO1_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_AUDIO1_CTRL)); tsc2102_read_sync(TSC2102_AUDIO1_CTRL));
printk("TSC2102_DAC_GAIN_CTRL = 0x%04x\n", printk(KERN_INFO "TSC2102_DAC_GAIN_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL)); tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL));
printk("TSC2102_AUDIO2_CTRL = 0x%04x\n", printk(KERN_INFO "TSC2102_AUDIO2_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_AUDIO2_CTRL)); tsc2102_read_sync(TSC2102_AUDIO2_CTRL));
printk("TSC2102_DAC_POWER_CTRL = 0x%04x\n", printk(KERN_INFO "TSC2102_DAC_POWER_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_DAC_POWER_CTRL)); tsc2102_read_sync(TSC2102_DAC_POWER_CTRL));
printk("TSC2102_AUDIO3_CTRL = 0x%04x\n", printk(KERN_INFO "TSC2102_AUDIO3_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_AUDIO_CTRL_3)); tsc2102_read_sync(TSC2102_AUDIO_CTRL_3));
printk("TSC2102_LCH_BASS_BOOST_N0 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_N0 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N0)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N0));
printk("TSC2102_LCH_BASS_BOOST_N1 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_N1 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N1)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N1));
printk("TSC2102_LCH_BASS_BOOST_N2 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_N2 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N2)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N2));
printk("TSC2102_LCH_BASS_BOOST_N3 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_N3 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N3)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N3));
printk("TSC2102_LCH_BASS_BOOST_N4 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_N4 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N4)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N4));
printk("TSC2102_LCH_BASS_BOOST_N5 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_N5 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N5)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_N5));
printk("TSC2102_LCH_BASS_BOOST_D1 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_D1 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D1)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D1));
printk("TSC2102_LCH_BASS_BOOST_D2 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_D2 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D2)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D2));
printk("TSC2102_LCH_BASS_BOOST_D4 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_D4 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D4)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D4));
printk("TSC2102_LCH_BASS_BOOST_D5 = 0x%04x\n", printk(KERN_INFO "TSC2102_LCH_BASS_BOOST_D5 = 0x%04x\n",
tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D5)); tsc2102_read_sync(TSC2102_LCH_BASS_BOOST_D5));
printk("TSC2102_RCH_BASS_BOOST_N0 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_N0 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N0)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N0));
printk("TSC2102_RCH_BASS_BOOST_N1 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_N1 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N1)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N1));
printk("TSC2102_RCH_BASS_BOOST_N2 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_N2 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N2)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N2));
printk("TSC2102_RCH_BASS_BOOST_N3 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_N3 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N3)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N3));
printk("TSC2102_RCH_BASS_BOOST_N4 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_N4 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N4)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N4));
printk("TSC2102_RCH_BASS_BOOST_N5 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_N5 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N5)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_N5));
printk("TSC2102_RCH_BASS_BOOST_D1 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_D1 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D1)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D1));
printk("TSC2102_RCH_BASS_BOOST_D2 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_D2 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D2)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D2));
printk("TSC2102_RCH_BASS_BOOST_D4 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_D4 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D4)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D4));
printk("TSC2102_RCH_BASS_BOOST_D5 = 0x%04x\n", printk(KERN_INFO "TSC2102_RCH_BASS_BOOST_D5 = 0x%04x\n",
tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D5)); tsc2102_read_sync(TSC2102_RCH_BASS_BOOST_D5));
printk("TSC2102_PLL1_CTRL = 0x%04x\n", printk(KERN_INFO "TSC2102_PLL1_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_PLL1_CTRL)); tsc2102_read_sync(TSC2102_PLL1_CTRL));
printk("TSC2102_PLL2_CTRL = 0x%04x\n", printk(KERN_INFO "TSC2102_PLL2_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_PLL2_CTRL)); tsc2102_read_sync(TSC2102_PLL2_CTRL));
printk("TSC2102_AUDIO4_CTRL = 0x%04x\n", printk(KERN_INFO "TSC2102_AUDIO4_CTRL = 0x%04x\n",
tsc2102_read_sync(TSC2102_AUDIO4_CTRL)); tsc2102_read_sync(TSC2102_AUDIO4_CTRL));
} }
#endif #endif
...@@ -131,7 +131,7 @@ static void dump_tsc2102_audio_regs(void) { ...@@ -131,7 +131,7 @@ static void dump_tsc2102_audio_regs(void) {
* ALSA operations according to board file * ALSA operations according to board file
*/ */
static long current_rate = 0; static long current_rate;
/* /*
* Sample rate changing * Sample rate changing
...@@ -180,7 +180,7 @@ static void tsc2102_configure(void) ...@@ -180,7 +180,7 @@ static void tsc2102_configure(void)
/* /*
* Omap McBSP clock and Power Management configuration * Omap McBSP clock and Power Management configuration
* *
* Here we have some functions that allow clock to be enabled and * Here we have some functions that allow clock to be enabled and
* disabled only when needed. Besides doing clock configuration * disabled only when needed. Besides doing clock configuration
* they allow turn audio on and off when necessary. * they allow turn audio on and off when necessary.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment