sound/pci: coding style fixes: echoaudio
PATCH 7/24 sound/pci: coding style fixes: echoaudio
- <asm/io.h> -> <linux/io.h>
- remove trailing whitespaces
- convert comments
Only compile tested.
Signed-off-by Alexander Beregalov <[email protected]>
---
sound/pci/echoaudio/darla20.c | 2 +- sound/pci/echoaudio/darla24.c | 2 +- sound/pci/echoaudio/echo3g.c | 2 +- sound/pci/echoaudio/echoaudio.c | 2 +- sound/pci/echoaudio/echoaudio.h | 2 +- sound/pci/echoaudio/echoaudio_dsp.h | 16 ++++++++-------- sound/pci/echoaudio/gina20.c | 2 +- sound/pci/echoaudio/gina24.c | 2 +- sound/pci/echoaudio/indigo.c | 2 +- sound/pci/echoaudio/indigodj.c | 2 +- sound/pci/echoaudio/indigoio.c | 2 +- sound/pci/echoaudio/layla20.c | 2 +- sound/pci/echoaudio/layla24.c | 2 +- sound/pci/echoaudio/layla24_dsp.c | 4 ++-- sound/pci/echoaudio/mia.c | 2 +- sound/pci/echoaudio/midi.c | 2 +- sound/pci/echoaudio/mona.c | 2 +- sound/pci/echoaudio/mona_dsp.c | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-)
sound/pci/echoaudio/darla20.c +1 -1
@@ -51,7 +51,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/darla24.c +1 -1
@@ -55,7 +55,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/echo3g.c +1 -1
@@ -63,7 +63,7 @@#include <sound/asoundef.h> #include <sound/initval.h> #include <sound/rawmidi.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/echoaudio.c +1 -1
@@ -1098,7 +1098,7 @@ static struct snd_kcontrol_new snd_echo_line_input_gain __devinitdata = {#ifdef ECHOCARD_HAS_OUTPUT_NOMINAL_LEVEL /************ Analog output nominal level (+4dBu / -10dBV) ***************/ -static int snd_echo_output_nominal_info (struct snd_kcontrol *kcontrol, +static int snd_echo_output_nominal_info (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_info *uinfo) {struct echoaudio *chip;
sound/pci/echoaudio/echoaudio.h +1 -1
@@ -218,7 +218,7 @@/**************************************************************************** -+ Clocks *****************************************************************************/
sound/pci/echoaudio/echoaudio_dsp.h +8 -8
@@ -103,7 +103,7 @@#define CHI32_STATUS_IRQ 0x00000040 -/* +/* * * DSP commands sent via slave mode; these are sent to the DSP by write_dsp() *
@@ -369,7 +369,7 @@ SET_LAYLA24_FREQUENCY_REG command.* via input and output pipes. LE means little-endian, * BE means big-endian. * -* DSP_AUDIOFORM_MS_8 +* DSP_AUDIOFORM_MS_8 * * 8-bit mono unsigned samples. For playback, * mono data is duplicated out the left and right channels
@@ -388,10 +388,10 @@ SET_LAYLA24_FREQUENCY_REG command.* they would be stored in memory like this: 33 22 11 66 55 44. * * DSP_AUDIOFORM_MS_32LE -* -* 24-bit signed little-endian mono samples in a 32-bit -* container. In other words, each sample is a 32-bit signed -* integer, where the actual audio data is left-justified +* +* 24-bit signed little-endian mono samples in a 32-bit +* container. In other words, each sample is a 32-bit signed +* integer, where the actual audio data is left-justified * in the 32 bits and only the 24 most significant bits are valid. * * DSP_AUDIOFORM_SS_8
@@ -435,8 +435,8 @@ SET_LAYLA24_FREQUENCY_REG command.* Super-interleave is defined as interleaving by 4 or more. Darla20 and Gina20 * do not support super interleave. * -* 16 bit, 24 bit, and 32 bit little endian samples are supported for super -* interleave. The interleave factor must be even. 16 - way interleave is the +* 16 bit, 24 bit, and 32 bit little endian samples are supported for super +* interleave. The interleave factor must be even. 16 - way interleave is the * current maximum, so you can interleave by 4, 6, 8, 10, 12, 14, and 16. * * The actual format code is derived by taking the define below and or-ing with
sound/pci/echoaudio/gina20.c +1 -1
@@ -55,7 +55,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/gina24.c +1 -1
@@ -61,7 +61,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/indigo.c +1 -1
@@ -53,7 +53,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/indigodj.c +1 -1
@@ -53,7 +53,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/indigoio.c +1 -1
@@ -54,7 +54,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/layla20.c +1 -1
@@ -61,7 +61,7 @@#include <sound/asoundef.h> #include <sound/initval.h> #include <sound/rawmidi.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/layla24.c +1 -1
@@ -63,7 +63,7 @@#include <sound/asoundef.h> #include <sound/initval.h> #include <sound/rawmidi.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/layla24_dsp.c +2 -2
@@ -149,7 +149,7 @@ static int load_asic(struct echoaudio *chip)if (!err) err =write_control_reg (chip,GML_CONVERTER_ENABLE |GML_48KHZ , TRUE); - +DE_INIT (("load_asic() done\n" ));return err; }
@@ -307,7 +307,7 @@ static int switch_asic(struct echoaudio *chip, const struct firmware *asic)if (asic != chip->asic_code) { monitors =kmemdup (chip->comm_page->monitors,MONITOR_ARRAY_SIZE ,GFP_KERNEL ); -if (! monitors) +if (!monitors)return -ENOMEM ; memset(chip->comm_page->monitors, ECHOGAIN_MUTED,
sound/pci/echoaudio/mia.c +1 -1
@@ -61,7 +61,7 @@#include <sound/asoundef.h> #include <sound/initval.h> #include <sound/rawmidi.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/midi.c +1 -1
@@ -66,7 +66,7 @@ static int write_midi(struct echoaudio *chip, u8 *data, int bytes)return -EIO ;/* HF4 indicates that it is safe to write MIDI output data */ -if (! (get_dsp_register (chip,CHI32_STATUS_REG ) &CHI32_STATUS_REG_HF4 )) +if (!(get_dsp_register (chip,CHI32_STATUS_REG ) &CHI32_STATUS_REG_HF4 ))return 0 ; chip->comm_page->midi_output[0 ] = bytes;
sound/pci/echoaudio/mona.c +1 -1
@@ -59,7 +59,7 @@#include <sound/pcm_params.h> #include <sound/asoundef.h> #include <sound/initval.h> -#include <asm/io.h> +#include <linux/io.h> #include <asm/atomic.h> #include "echoaudio.h"
sound/pci/echoaudio/mona_dsp.c +1 -1
@@ -114,7 +114,7 @@ static u32 detect_input_clocks(const struct echoaudio *chip) -/* Mona has an ASIC on the PCI card and another ASIC in the external box; +/* Mona has an ASIC on the PCI card and another ASIC in the external box; both need to be loaded. */ static int load_asic (struct echoaudio *chip) {