I started with Takashi's sound-unstable tree as a base:
Fixed:
* ice1724 compilation error (one { too much)
* checkpatch errors along the files
sound/pci/ice1712/ak4xxx.c total: 1 errors, 3 warnings, 0 checks, 196
lines checked
sound/pci/ice1712/amp.h total: 0 errors, 0 warnings, 1 checks, 51 lines checked
sound/pci/ice1712/aureon.c total: 0 errors, 121 warnings, 3 checks,
2284 lines checked
sound/pci/ice1712/aureon.h total: 0 errors, 1 warnings, 0 checks, 65
lines checked
sound/pci/ice1712/delta.c total: 17 errors, 44 warnings, 1 checks, 817
lines checked
sound/pci/ice1712/delta.h total: 0 errors, 8 warnings, 0 checks, 153
lines checked
sound/pci/ice1712/envy24ht.h total: 0 errors, 21 warnings, 0 checks,
221 lines checked
sound/pci/ice1712/ews.c total: 27 errors, 64 warnings, 2 checks, 1087
lines checked
sound/pci/ice1712/ews.h total: 0 errors, 7 warnings, 0 checks, 86 lines checked
sound/pci/ice1712/hoontech.c total: 13 errors, 10 warnings, 1 checks,
360 lines checked
sound/pci/ice1712/hoontech.h total: 2 errors, 7 warnings, 0 checks, 77
lines checked
sound/pci/ice1712/ice1712.c total: 14 errors, 162 warnings, 3 checks,
2799 lines checked
sound/pci/ice1712/ice1712.h total: 0 errors, 22 warnings, 3 checks,
511 lines checked
sound/pci/ice1712/ice1724.c total: 11 errors, 62 warnings, 8 checks,
2657 lines checked
sound/pci/ice1712/juli.c total: 0 errors, 0 warnings, 1 checks, 687
lines checked
sound/pci/ice1712/maya44.c total: 6 errors, 0 warnings, 16 checks, 761
lines checked
sound/pci/ice1712/pontis.c total: 0 errors, 40 warnings, 3 checks, 836
lines checked
sound/pci/ice1712/prodigy192.c total: 12 errors, 21 warnings, 0
checks, 817 lines checked
sound/pci/ice1712/prodigy_hifi.c total: 0 errors, 0 warnings, 1
checks, 1215 lines checked
sound/pci/ice1712/snd-ice1712.mod.c total: 0 errors, 1 warnings, 0
checks, 113 lines checked
sound/pci/ice1712/snd-ice1724.mod.c total: 0 errors, 1 warnings, 0
checks, 126 lines checked
sound/pci/ice1712/vt1732.c total: 51 errors, 3 warnings, 5 checks,
2759 lines checked
sound/pci/ice1712/vt1732.h total: 9 errors, 0 warnings, 2 checks, 452
lines checked
It compiles. At first run ice1724 complained about something
info-related (it's likely that it's not related to this patch at all)
and generated like 20 or 30 lines of warnings and errors along the
lines 890 - 900. On second run there was no errors or warnings
anymore.
--
Vedran Miletić
From 3f2e00c4fcb1f9dbebcdc00a6b9209140b6cffb0 Mon Sep 17 00:00:00 2001
From: Vedran Miletic <rivanvx@xxxxxxxxx>
Date: Sun, 7 Sep 2008 16:54:15 +0200
Subject: [PATCH] ALSA: ice1712: coding style fixes (part 2)
This is the second part of coding style fixes, it brings us to:
ak4xxx.c total: 1 errors, 3 warnings, 0 checks, 196 lines checked
amp.h total: 0 errors, 0 warnings, 1 checks, 51 lines checked
aureon.c total: 0 errors, 121 warnings, 3 checks, 2284 lines checked
aureon.h total: 0 errors, 1 warnings, 0 checks, 65 lines checked
delta.c total: 17 errors, 44 warnings, 1 checks, 817 lines checked
delta.h total: 0 errors, 8 warnings, 0 checks, 153 lines checked
envy24ht.h total: 0 errors, 21 warnings, 0 checks, 221 lines checked
ews.c total: 27 errors, 64 warnings, 2 checks, 1087 lines checked
ews.h total: 0 errors, 7 warnings, 0 checks, 86 lines checked
hoontech.c total: 13 errors, 10 warnings, 1 checks, 360 lines checked
hoontech.h total: 2 errors, 7 warnings, 0 checks, 77 lines checked
ice1712.c total: 14 errors, 162 warnings, 3 checks, 2799 lines checked
ice1712.h total: 0 errors, 22 warnings, 3 checks, 511 lines checked
ice1724.c total: 11 errors, 62 warnings, 8 checks, 2657 lines checked
juli.c total: 0 errors, 0 warnings, 1 checks, 687 lines checked
maya44.c total: 6 errors, 0 warnings, 16 checks, 761 lines checked
pontis.c total: 0 errors, 40 warnings, 3 checks, 836 lines checked
prodigy192.c total: 12 errors, 21 warnings, 0 checks, 817 lines checked
prodigy_hifi.c total: 0 errors, 0 warnings, 1 checks, 1215 lines checked
snd-ice1712.mod.c total: 0 errors, 1 warnings, 0 checks, 113 lines checked
snd-ice1724.mod.c total: 0 errors, 1 warnings, 0 checks, 126 lines checked
vt1732.c total: 51 errors, 3 warnings, 5 checks, 2759 lines checked
vt1732.h total: 9 errors, 0 warnings, 2 checks, 452 lines checked
It also fixes compile error of ice1724.c (there was one { too much).
Signed-off-by: Vedran Miletic <rivanvx@xxxxxxxxx>
---
sound/pci/ice1712/ak4xxx.c | 16 +++--
sound/pci/ice1712/amp.c | 9 ++-
sound/pci/ice1712/amp.h | 11 ++-
sound/pci/ice1712/aureon.h | 2 +-
sound/pci/ice1712/delta.c | 2 +-
sound/pci/ice1712/delta.h | 2 +-
sound/pci/ice1712/envy24ht.h | 22 +++---
sound/pci/ice1712/ews.h | 2 +-
sound/pci/ice1712/hoontech.h | 2 +-
sound/pci/ice1712/ice1724.c | 1 -
sound/pci/ice1712/juli.c | 2 +-
sound/pci/ice1712/pontis.c | 14 ++--
sound/pci/ice1712/pontis.h | 5 +-
sound/pci/ice1712/prodigy_hifi.c | 143 ++++++++++++++++++++------------------
sound/pci/ice1712/prodigy_hifi.h | 11 ++--
sound/pci/ice1712/revo.c | 11 ++--
sound/pci/ice1712/revo.h | 2 +-
sound/pci/ice1712/se.c | 6 +-
sound/pci/ice1712/vt1720_mobo.c | 2 +-
sound/pci/ice1712/vt1720_mobo.h | 2 +-
20 files changed, 140 insertions(+), 127 deletions(-)
diff --git a/sound/pci/ice1712/ak4xxx.c b/sound/pci/ice1712/ak4xxx.c
index 03391da..4caff20 100644
--- a/sound/pci/ice1712/ak4xxx.c
+++ b/sound/pci/ice1712/ak4xxx.c
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#include <asm/io.h>
#include <linux/delay.h>
@@ -121,8 +121,10 @@ static void snd_ice1712_akm4xxx_write(struct snd_akm4xxx *ak, int chip,
/*
* initialize the struct snd_akm4xxx record with the template
*/
-int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak, const struct snd_akm4xxx *temp,
- const struct snd_ak4xxx_private *_priv, struct snd_ice1712 *ice)
+int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak,
+ const struct snd_akm4xxx *temp,
+ const struct snd_ak4xxx_private *_priv,
+ struct snd_ice1712 *ice)
{
struct snd_ak4xxx_private *priv;
@@ -136,7 +138,7 @@ int snd_ice1712_akm4xxx_init(struct snd_akm4xxx *ak, const struct snd_akm4xxx *t
}
*ak = *temp;
ak->card = ice->card;
- ak->private_value[0] = (unsigned long)priv;
+ ak->private_value[0] = (unsigned long) priv;
ak->private_data[0] = ice;
if (ak->ops.lock == NULL)
ak->ops.lock = snd_ice1712_akm4xxx_lock;
@@ -155,7 +157,7 @@ void snd_ice1712_akm4xxx_free(struct snd_ice1712 *ice)
return;
for (akidx = 0; akidx < ice->akm_codecs; akidx++) {
struct snd_akm4xxx *ak = &ice->akm[akidx];
- kfree((void*)ak->private_value[0]);
+ kfree((void*) ak->private_value[0]);
}
kfree(ice->akm);
}
@@ -181,11 +183,11 @@ static int __init alsa_ice1712_akm4xxx_module_init(void)
{
return 0;
}
-
+
static void __exit alsa_ice1712_akm4xxx_module_exit(void)
{
}
-
+
module_init(alsa_ice1712_akm4xxx_module_init)
module_exit(alsa_ice1712_akm4xxx_module_exit)
diff --git a/sound/pci/ice1712/amp.c b/sound/pci/ice1712/amp.c
index 3756430..8c4478e 100644
--- a/sound/pci/ice1712/amp.c
+++ b/sound/pci/ice1712/amp.c
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#include <asm/io.h>
#include <linux/delay.h>
@@ -45,7 +45,7 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
WM_ATTEN_L, 0x0000, /* 0 db */
WM_ATTEN_R, 0x0000, /* 0 db */
WM_DAC_CTRL, 0x0008, /* 24bit I2S */
- WM_INT_CTRL, 0x0001, /* 24bit I2S */
+ WM_INT_CTRL, 0x0001, /* 24bit I2S */
};
unsigned int i;
@@ -67,8 +67,9 @@ static int __devinit snd_vt1724_amp_init(struct snd_ice1712 *ice)
static int __devinit snd_vt1724_amp_add_controls(struct snd_ice1712 *ice)
{
- /* we use pins 39 and 41 of the VT1616 for left and right read outputs */
- snd_ac97_write_cache(ice->ac97, 0x5a, snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
+ /* we use pins 39 and 41 of VT1616 for left and right read outputs */
+ snd_ac97_write_cache(ice->ac97, 0x5a,
+ snd_ac97_read(ice->ac97, 0x5a) & ~0x8000);
return 0;
}
diff --git a/sound/pci/ice1712/amp.h b/sound/pci/ice1712/amp.h
index bf81d30..fb8f6c4 100644
--- a/sound/pci/ice1712/amp.h
+++ b/sound/pci/ice1712/amp.h
@@ -22,17 +22,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define AMP_AUDIO2000_DEVICE_DESC "{AMP Ltd,AUDIO2000},"\
"{Chaintech,AV-710},"
#if 0
-#define VT1724_SUBDEVICE_AUDIO2000 0x12142417 /* Advanced Micro Peripherals Ltd AUDIO2000 */
+/* Advanced Micro Peripherals Ltd AUDIO2000 */
+#define VT1724_SUBDEVICE_AUDIO2000 0x12142417
#else
-#define VT1724_SUBDEVICE_AUDIO2000 0x00030003 /* a dummy ID for AMP Audio2000 */
+/* a dummy ID for AMP Audio2000 */
+#define VT1724_SUBDEVICE_AUDIO2000 0x00030003
#endif
-#define VT1724_SUBDEVICE_AV710 0x12142417 /* AV710 - the same ID with Audio2000! */
+/* AV710 - the same ID with Audio2000! */
+#define VT1724_SUBDEVICE_AV710 0x12142417
/* WM8728 on I2C for AV710 */
#define WM_DEV 0x36
diff --git a/sound/pci/ice1712/aureon.h b/sound/pci/ice1712/aureon.h
index c253b8e..098792a 100644
--- a/sound/pci/ice1712/aureon.h
+++ b/sound/pci/ice1712/aureon.h
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define AUREON_DEVICE_DESC "{Terratec,Aureon 5.1 Sky},"\
"{Terratec,Aureon 7.1 Space},"\
diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c
index d216362..8efd8f5 100644
--- a/sound/pci/ice1712/delta.c
+++ b/sound/pci/ice1712/delta.c
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h
index f7f14df..5bff36a 100644
--- a/sound/pci/ice1712/delta.h
+++ b/sound/pci/ice1712/delta.h
@@ -23,7 +23,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define DELTA_DEVICE_DESC \
"{MidiMan M Audio,Delta 1010},"\
diff --git a/sound/pci/ice1712/envy24ht.h b/sound/pci/ice1712/envy24ht.h
index a0c5e00..cafb055 100644
--- a/sound/pci/ice1712/envy24ht.h
+++ b/sound/pci/ice1712/envy24ht.h
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#include <sound/control.h>
#include <sound/ac97_codec.h>
@@ -45,7 +45,7 @@ enum {
ICE_EEP2_GPIO_STATE1, /* 11 */
ICE_EEP2_GPIO_STATE2 /* 12 */
};
-
+
/*
* Direct registers
*/
@@ -87,8 +87,8 @@ enum {
#define VT1724_CFG_SPDIF_OUT 0x01 /* External S/PDIF output is present */
/*there is no consumer AC97 codec with the VT1724*/
-//#define VT1724_REG_AC97_INDEX 0x08 /* byte */
-//#define VT1724_REG_AC97_CMD 0x09 /* byte */
+/* #define VT1724_REG_AC97_INDEX 0x08 */ /* byte */
+/* #define VT1724_REG_AC97_CMD 0x09 */ /* byte */
#define VT1724_REG_MPU_TXFIFO 0x0a /*byte ro. number of bytes in TX fifo*/
#define VT1724_REG_MPU_RXFIFO 0x0b /*byte ro. number of bytes in RX fifo*/
@@ -102,8 +102,9 @@ enum {
#define VT1724_MPU_RX_FULL 0x10
#define VT1724_REG_MPU_FIFO_WM 0x0e /*byte set the high/low watermarks for RX/TX fifos*/
-#define VT1724_MPU_RX_FIFO 0x20 //1=rx fifo watermark 0=tx fifo watermark
-#define VT1724_MPU_FIFO_MASK 0x1f
+#define VT1724_MPU_RX_FIFO 0x20 /* 1=rx fifo watermark
+ 0=tx fifo watermark */
+#define VT1724_MPU_FIFO_MASK 0x1f
#define VT1724_REG_I2C_DEV_ADDR 0x10 /* byte */
#define VT1724_I2C_WRITE 0x01 /* write direction */
@@ -115,15 +116,16 @@ enum {
#define VT1724_REG_GPIO_DATA 0x14 /* word */
#define VT1724_REG_GPIO_WRITE_MASK 0x16 /* word */
-#define VT1724_REG_GPIO_DIRECTION 0x18 /* dword? (3 bytes) 0=input 1=output.
- bit3 - during reset used for Eeprom power-on strapping
- if TESTEN# pin active, bit 2 always input*/
+#define VT1724_REG_GPIO_DIRECTION 0x18 /* dword? (3 bytes) 0=input 1=output.
+ bit3 - during reset used for
+ EEPROM power-on strapping
+ if TESTEN# pin active, bit2 always input */
#define VT1724_REG_POWERDOWN 0x1c
#define VT1724_REG_GPIO_DATA_22 0x1e /* byte direction for GPIO 16:22 */
#define VT1724_REG_GPIO_WRITE_MASK_22 0x1f /* byte write mask for GPIO 16:22 */
-/*
+/*
* Professional multi-track direct control registers
*/
diff --git a/sound/pci/ice1712/ews.h b/sound/pci/ice1712/ews.h
index 1c44371..1b478cf 100644
--- a/sound/pci/ice1712/ews.h
+++ b/sound/pci/ice1712/ews.h
@@ -23,7 +23,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define EWS_DEVICE_DESC \
"{TerraTec,EWX 24/96},"\
diff --git a/sound/pci/ice1712/hoontech.h b/sound/pci/ice1712/hoontech.h
index cc1da1e..a37a087 100644
--- a/sound/pci/ice1712/hoontech.h
+++ b/sound/pci/ice1712/hoontech.h
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define HOONTECH_DEVICE_DESC \
"{Hoontech,SoundTrack DSP 24}," \
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index e8aabe6..844ec70 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -871,7 +871,6 @@ static const struct vt1724_pcm_reg vt1724_rdma1_reg = {
#define vt1724_capture_spdif_reg vt1724_rdma1_reg
static const struct snd_pcm_hardware snd_vt1724_playback_pro = {
-{
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP_VALID |
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index c51659b..c680ce3 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -211,7 +211,7 @@ static void juli_akm_write(struct snd_akm4xxx *ak, int chip,
unsigned char addr, unsigned char data)
{
struct snd_ice1712 *ice = ak->private_data[0];
-
+
if (snd_BUG_ON(chip))
return;
snd_vt1724_write_i2c(ice, AK4358_ADDR, addr, data);
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index 6bc3f91..770cca9 100644
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -43,8 +43,8 @@
/* WM8776 registers */
#define WM_HP_ATTEN_L 0x00 /* headphone left attenuation */
#define WM_HP_ATTEN_R 0x01 /* headphone left attenuation */
-#define WM_HP_MASTER 0x02 /* headphone master (both channels) */
- /* override LLR */
+#define WM_HP_MASTER 0x02 /* headphone master (both channels),
+ override LLR */
#define WM_DAC_ATTEN_L 0x03 /* digital left attenuation */
#define WM_DAC_ATTEN_R 0x04
#define WM_DAC_MASTER 0x05
@@ -476,7 +476,7 @@ static int pontis_gpio_mask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_el
mutex_unlock(&ice->gpio_mutex);
return 0;
}
-
+
static int pontis_gpio_mask_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
@@ -500,7 +500,7 @@ static int pontis_gpio_dir_get(struct snd_kcontrol *kcontrol, struct snd_ctl_ele
mutex_unlock(&ice->gpio_mutex);
return 0;
}
-
+
static int pontis_gpio_dir_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
@@ -667,7 +667,7 @@ static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buff
static void wm_proc_init(struct snd_ice1712 *ice)
{
struct snd_info_entry *entry;
- if (! snd_card_proc_new(ice->card, "wm_codec", &entry)) {
+ if (!snd_card_proc_new(ice->card, "wm_codec", &entry)) {
snd_info_set_text_ops(entry, ice, wm_proc_regs_read);
entry->mode |= S_IWUSR;
entry->c.text.write = wm_proc_regs_write;
@@ -692,7 +692,7 @@ static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buff
static void cs_proc_init(struct snd_ice1712 *ice)
{
struct snd_info_entry *entry;
- if (! snd_card_proc_new(ice->card, "cs_codec", &entry))
+ if (!snd_card_proc_new(ice->card, "cs_codec", &entry))
snd_info_set_text_ops(entry, ice, cs_proc_regs_read);
}
@@ -770,7 +770,7 @@ static int __devinit pontis_init(struct snd_ice1712 *ice)
/* to remeber the register values */
ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
- if (! ice->akm)
+ if (!ice->akm)
return -ENOMEM;
ice->akm_codecs = 1;
diff --git a/sound/pci/ice1712/pontis.h b/sound/pci/ice1712/pontis.h
index d0d1378..05ebd28 100644
--- a/sound/pci/ice1712/pontis.h
+++ b/sound/pci/ice1712/pontis.h
@@ -22,11 +22,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define PONTIS_DEVICE_DESC "{Pontis,MS300},"
-#define VT1720_SUBDEVICE_PONTIS_MS300 0x00020002 /* a dummy id for MS300 */
+/* a dummy id for MS300 */
+#define VT1720_SUBDEVICE_PONTIS_MS300 0x00020002
extern struct snd_ice1712_card_info snd_vt1720_pontis_cards[];
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
index 043a938..d7f73e4 100644
--- a/sound/pci/ice1712/prodigy_hifi.c
+++ b/sound/pci/ice1712/prodigy_hifi.c
@@ -1,7 +1,7 @@
/*
* ALSA driver for ICEnsemble VT1724 (Envy24HT)
*
- * Lowlevel functions for Audiotrak Prodigy 7.1 Hifi
+ * Lowlevel functions for Audiotrak Prodigy 7.1 HiFi and Prodigy HD2
* based on pontis.c
*
* Copyright (c) 2007 Julian Scheel <julian@xxxxxxxx>
@@ -51,7 +51,7 @@ struct prodigy_hifi_spec {
/* WM8776 registers */
#define WM_HP_ATTEN_L 0x00 /* headphone left attenuation */
#define WM_HP_ATTEN_R 0x01 /* headphone left attenuation */
-#define WM_HP_MASTER 0x02 /* headphone master (both channels),
+#define WM_HP_MASTER 0x02 /* headphone master (both channels)
override LLR */
#define WM_DAC_ATTEN_L 0x03 /* digital left attenuation */
#define WM_DAC_ATTEN_R 0x04
@@ -86,40 +86,40 @@ struct prodigy_hifi_spec {
#define WM_AIN5 "AIN5"
/* GPIO pins of envy24ht connected to wm8766 */
-#define WM8766_SPI_CLK (1<<17) /* CLK, Pin97 on ICE1724 */
-#define WM8766_SPI_MD (1<<16) /* DATA VT1724 -> WM8766, Pin96 */
-#define WM8766_SPI_ML (1<<18) /* Latch, Pin98 */
+#define WM8766_SPI_CLK (1<<17) /* CLK, Pin97 on ICE1724 */
+#define WM8766_SPI_MD (1<<16) /* DATA VT1724 -> WM8766, Pin96 */
+#define WM8766_SPI_ML (1<<18) /* Latch, Pin98 */
/* WM8766 registers */
-#define WM8766_DAC_CTRL 0x02 /* DAC Control */
-#define WM8766_INT_CTRL 0x03 /* Interface Control */
+#define WM8766_DAC_CTRL 0x02 /* DAC Control */
+#define WM8766_INT_CTRL 0x03 /* Interface Control */
#define WM8766_DAC_CTRL2 0x09
#define WM8766_DAC_CTRL3 0x0a
-#define WM8766_RESET 0x1f
-#define WM8766_LDA1 0x00
-#define WM8766_LDA2 0x04
-#define WM8766_LDA3 0x06
-#define WM8766_RDA1 0x01
-#define WM8766_RDA2 0x05
-#define WM8766_RDA3 0x07
-#define WM8766_MUTE1 0x0C
-#define WM8766_MUTE2 0x0F
+#define WM8766_RESET 0x1f
+#define WM8766_LDA1 0x00
+#define WM8766_LDA2 0x04
+#define WM8766_LDA3 0x06
+#define WM8766_RDA1 0x01
+#define WM8766_RDA2 0x05
+#define WM8766_RDA3 0x07
+#define WM8766_MUTE1 0x0C
+#define WM8766_MUTE2 0x0F
/*
* Prodigy HD2
*/
-#define AK4396_ADDR 0x00
-#define AK4396_CSN (1 << 8) /* CSN->GPIO8, pin 75 */
-#define AK4396_CCLK (1 << 9) /* CCLK->GPIO9, pin 76 */
-#define AK4396_CDTI (1 << 10) /* CDTI->GPIO10, pin 77 */
+#define AK4396_ADDR 0x00
+#define AK4396_CSN (1 << 8) /* CSN->GPIO8, pin 75 */
+#define AK4396_CCLK (1 << 9) /* CCLK->GPIO9, pin 76 */
+#define AK4396_CDTI (1 << 10) /* CDTI->GPIO10, pin 77 */
/* ak4396 registers */
-#define AK4396_CTRL1 0x00
-#define AK4396_CTRL2 0x01
-#define AK4396_CTRL3 0x02
-#define AK4396_LCH_ATT 0x03
-#define AK4396_RCH_ATT 0x04
+#define AK4396_CTRL1 0x00
+#define AK4396_CTRL2 0x01
+#define AK4396_CTRL3 0x02
+#define AK4396_LCH_ATT 0x03
+#define AK4396_RCH_ATT 0x04
/*
@@ -230,7 +230,7 @@ static void ak4396_write(struct snd_ice1712 *ice, unsigned int reg,
snd_ice1712_gpio_set_dir(ice, AK4396_CSN|AK4396_CCLK|AK4396_CDTI);
snd_ice1712_gpio_set_mask(ice, ~(AK4396_CSN|AK4396_CCLK|AK4396_CDTI));
/* latch must be low when writing */
- set_gpio_bit(ice, AK4396_CSN, 0);
+ set_gpio_bit(ice, AK4396_CSN, 0);
block = ((AK4396_ADDR & 0x03) << 14) | (1 << 13) |
((reg & 0x1f) << 8) | (data & 0xff);
ak4396_send_word(ice, block); /* REGISTER ADDRESS */
@@ -269,20 +269,21 @@ static int ak4396_dac_vol_get(struct snd_kcontrol *kcontrol,
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
struct prodigy_hifi_spec *spec = ice->spec;
int i;
-
+
for (i = 0; i < 2; i++)
ucontrol->value.integer.value[i] = spec->vol[i];
return 0;
}
-static int ak4396_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int ak4396_dac_vol_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
{
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
struct prodigy_hifi_spec *spec = ice->spec;
int i;
int change = 0;
-
+
mutex_lock(&ice->gpio_mutex);
for (i = 0; i < 2; i++) {
if (ucontrol->value.integer.value[i] != spec->vol[i]) {
@@ -319,18 +320,18 @@ static struct snd_kcontrol_new prodigy_hd2_controls[] __devinitdata = {
* Computed as 20 * Log10(255 / x)
*/
static const unsigned char wm_vol[256] = {
- 127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24, 23,
- 23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17, 17, 17,
- 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 13, 13, 13,
- 13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
- 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0
+ 127, 48, 42, 39, 36, 34, 33, 31, 30, 29, 28, 27, 27, 26, 25, 25, 24, 24,
+ 23, 23, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 18, 17,
+ 17, 17, 17, 16, 16, 16, 16, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14,
+ 13, 13, 13, 13, 13, 13, 13, 12, 12, 12, 12, 12, 12, 12, 11, 11, 11, 11,
+ 11, 11, 11, 11, 11, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9,
+ 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7,
+ 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#define WM_VOL_MAX (sizeof(wm_vol) - 1)
@@ -346,7 +347,7 @@ static void wm_set_vol(struct snd_ice1712 *ice, unsigned int index,
unsigned short vol, unsigned short master)
{
unsigned char nvol;
-
+
if ((master & WM_VOL_MUTE) || (vol & WM_VOL_MUTE))
nvol = 0;
else {
@@ -354,7 +355,7 @@ static void wm_set_vol(struct snd_ice1712 *ice, unsigned int index,
& WM_VOL_MAX;
nvol = (nvol ? (nvol + DAC_MIN) : 0) & 0xff;
}
-
+
wm_put(ice, index, nvol);
wm_put_nocache(ice, index, 0x100 | nvol);
}
@@ -363,7 +364,7 @@ static void wm8766_set_vol(struct snd_ice1712 *ice, unsigned int index,
unsigned short vol, unsigned short master)
{
unsigned char nvol;
-
+
if ((master & WM_VOL_MUTE) || (vol & WM_VOL_MUTE))
nvol = 0;
else {
@@ -403,7 +404,8 @@ static int wm_dac_vol_get(struct snd_kcontrol *kcontrol,
return 0;
}
-static int wm_dac_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int wm_dac_vol_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
{
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
struct prodigy_hifi_spec *spec = ice->spec;
@@ -452,7 +454,8 @@ static int wm8766_vol_get(struct snd_kcontrol *kcontrol,
return 0;
}
-static int wm8766_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int wm8766_vol_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
{
struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
struct prodigy_hifi_spec *spec = ice->spec;
@@ -527,7 +530,7 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol,
change = 1;
}
}
- mutex_unlock(&ice->gpio_mutex);
+ mutex_unlock(&ice->gpio_mutex);
return change;
}
@@ -537,7 +540,7 @@ static int wm_master_vol_put(struct snd_kcontrol *kcontrol,
static int wm_adc_mux_enum_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
- static char* texts[32] = {
+ static char *texts[32] = {
"NULL", WM_AIN1, WM_AIN2, WM_AIN1 "+" WM_AIN2,
WM_AIN3, WM_AIN1 "+" WM_AIN3, WM_AIN2 "+" WM_AIN3,
WM_AIN1 "+" WM_AIN2 "+" WM_AIN3,
@@ -685,15 +688,15 @@ static int wm_adc_mux_put(struct snd_kcontrol *kcontrol,
int change;
mutex_lock(&ice->gpio_mutex);
- nval = oval = wm_get(ice, WM_ADC_MUX);
+ oval = wm_get(ice, WM_ADC_MUX);
+ nval = oval;
if (ucontrol->value.integer.value[0])
nval |= (1 << bit);
else
nval &= ~(1 << bit);
change = nval != oval;
- if (change) {
+ if (change)
wm_put(ice, WM_ADC_MUX, nval);
- }
mutex_unlock(&ice->gpio_mutex);
return 0;
}
@@ -723,7 +726,8 @@ static int wm_bypass_put(struct snd_kcontrol *kcontrol,
int change = 0;
mutex_lock(&ice->gpio_mutex);
- val = oval = wm_get(ice, WM_OUT_MUX);
+ oval = wm_get(ice, WM_OUT_MUX);
+ val = oval;
if (ucontrol->value.integer.value[0])
val |= 0x04;
else
@@ -945,7 +949,8 @@ static int __devinit prodigy_hifi_add_controls(struct snd_ice1712 *ice)
for (i = 0; i < ARRAY_SIZE(prodigy_hifi_controls); i++) {
err = snd_ctl_add(ice->card,
- snd_ctl_new1(&prodigy_hifi_controls[i], ice));
+ snd_ctl_new1(&prodigy_hifi_controls[i],
+ ice));
if (err < 0)
return err;
}
@@ -962,7 +967,8 @@ static int __devinit prodigy_hd2_add_controls(struct snd_ice1712 *ice)
for (i = 0; i < ARRAY_SIZE(prodigy_hd2_controls); i++) {
err = snd_ctl_add(ice->card,
- snd_ctl_new1(&prodigy_hd2_controls[i], ice));
+ snd_ctl_new1(&prodigy_hd2_controls[i],
+ ice));
if (err < 0)
return err;
}
@@ -982,7 +988,7 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)
/* These come first to reduce init pop noise */
WM_ADC_MUX, 0x0003, /* ADC mute */
/* 0x00c0 replaced by 0x0003 */
-
+
WM_DAC_MUTE, 0x0001, /* DAC softmute */
WM_DAC_CTRL1, 0x0000, /* DAC mute */
@@ -1049,7 +1055,7 @@ static int __devinit prodigy_hifi_init(struct snd_ice1712 *ice)
/* to remeber the register values */
ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
- if (! ice->akm)
+ if (!ice->akm)
return -ENOMEM;
ice->akm_codecs = 1;
@@ -1082,7 +1088,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)
static unsigned short ak4396_inits[] = {
AK4396_CTRL1, 0x87, /* I2S Normal Mode, 24 bit */
AK4396_CTRL2, 0x02,
- AK4396_CTRL3, 0x00,
+ AK4396_CTRL3, 0x00,
AK4396_LCH_ATT, 0x00,
AK4396_RCH_ATT, 0x00,
};
@@ -1103,7 +1109,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)
/* to remeber the register values */
ice->akm = kzalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
- if (! ice->akm)
+ if (!ice->akm)
return -ENOMEM;
ice->akm_codecs = 1;
@@ -1117,7 +1123,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)
ak4396_write(ice, AK4396_CTRL1, 0x86);
msleep(100);
ak4396_write(ice, AK4396_CTRL1, 0x87);
-
+
for (i = 0; i < ARRAY_SIZE(ak4396_inits); i += 2)
ak4396_write(ice, ak4396_inits[i], ak4396_inits[i+1]);
@@ -1158,7 +1164,7 @@ static unsigned char prodigyhd2_eeprom[] __devinitdata = {
};
static unsigned char fortissimo4_eeprom[] __devinitdata = {
- 0x43, /* SYSCONF: clock 512, ADC, 4DACs */
+ 0x43, /* SYSCONF: clock 512, ADC, 4DACs */
0x80, /* ACLINK: I2S */
0xfc, /* I2S: vol, 96k, 24bit, 192k */
0xc1, /* SPDIF: out-en, out-int */
@@ -1186,14 +1192,14 @@ struct snd_ice1712_card_info snd_vt1724_prodigy_hifi_cards[] __devinitdata = {
.driver = "Prodigy71HIFI",
},
{
- .subvendor = VT1724_SUBDEVICE_PRODIGY_HD2,
- .name = "Audiotrak Prodigy HD2",
- .model = "prodigyhd2",
- .chip_init = prodigy_hd2_init,
- .build_controls = prodigy_hd2_add_controls,
- .eeprom_size = sizeof(prodigyhd2_eeprom),
- .eeprom_data = prodigyhd2_eeprom,
- .driver = "Prodigy71HD2",
+ .subvendor = VT1724_SUBDEVICE_PRODIGY_HD2,
+ .name = "Audiotrak Prodigy HD2",
+ .model = "prodigyhd2",
+ .chip_init = prodigy_hd2_init,
+ .build_controls = prodigy_hd2_add_controls,
+ .eeprom_size = sizeof(prodigyhd2_eeprom),
+ .eeprom_data = prodigyhd2_eeprom,
+ .driver = "Prodigy71HD2",
},
{
.subvendor = VT1724_SUBDEVICE_FORTISSIMO4,
@@ -1207,4 +1213,3 @@ struct snd_ice1712_card_info snd_vt1724_prodigy_hifi_cards[] __devinitdata = {
},
{ } /* terminator */
};
-
diff --git a/sound/pci/ice1712/prodigy_hifi.h b/sound/pci/ice1712/prodigy_hifi.h
index a4415d4..45fcfe2 100644
--- a/sound/pci/ice1712/prodigy_hifi.h
+++ b/sound/pci/ice1712/prodigy_hifi.h
@@ -4,7 +4,7 @@
/*
* ALSA driver for VIA VT1724 (Envy24HT)
*
- * Lowlevel functions for Audiotrak Prodigy Hifi
+ * Lowlevel functions for Audiotrak Prodigy HiFi and Prodigy HD2
*
* Copyright (c) 2004 Takashi Iwai <tiwai@xxxxxxx>
*
@@ -22,17 +22,16 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
-#define PRODIGY_HIFI_DEVICE_DESC "{Audiotrak,Prodigy 7.1 HIFI},"\
- "{Audiotrak Prodigy HD2},"\
- "{Hercules Fortissimo IV},"
+#define PRODIGY_HIFI_DEVICE_DESC "{Audiotrak,Prodigy 7.1 HIFI},"\
+ "{Audiotrak Prodigy HD2},"\
+ "{Hercules Fortissimo IV},"
#define VT1724_SUBDEVICE_PRODIGY_HIFI 0x38315441 /* PRODIGY 7.1 HIFI */
#define VT1724_SUBDEVICE_PRODIGY_HD2 0x37315441 /* PRODIGY HD2 */
#define VT1724_SUBDEVICE_FORTISSIMO4 0x81160100 /* Fortissimo IV */
-
extern struct snd_ice1712_card_info snd_vt1724_prodigy_hifi_cards[];
#endif /* __SOUND_PRODIGY_HIFI_H */
diff --git a/sound/pci/ice1712/revo.c b/sound/pci/ice1712/revo.c
index b508bb3..be756bd 100644
--- a/sound/pci/ice1712/revo.c
+++ b/sound/pci/ice1712/revo.c
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#include <asm/io.h>
#include <linux/delay.h>
@@ -193,7 +193,7 @@ static int revo51_i2c_init(struct snd_ice1712 *ice,
* initialize the chips on M-Audio Revolution cards
*/
-#define AK_DAC(xname,xch) { .name = xname, .num_channels = xch }
+#define AK_DAC(xname, xch) { .name = xname, .num_channels = xch }
static const struct snd_akm4xxx_dac_channel revo71_front[] = {
{
@@ -522,8 +522,9 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
}
/* second stage of initialization, analog parts and others */
- ak = ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
- if (! ak)
+ ice->akm = kcalloc(2, sizeof(struct snd_akm4xxx), GFP_KERNEL);
+ ak = ice->akm;
+ if (!ak)
return -ENOMEM;
switch (ice->eeprom.subvendor) {
case VT1724_SUBDEVICE_REVOLUTION71:
@@ -563,7 +564,7 @@ static int __devinit revo_init(struct snd_ice1712 *ice)
ice);
if (err < 0)
return err;
-
+
/* unmute all codecs */
snd_ice1712_gpio_write_bits(ice, VT1724_REVO_MUTE,
VT1724_REVO_MUTE);
diff --git a/sound/pci/ice1712/revo.h b/sound/pci/ice1712/revo.h
index a3ba425..8685ac5 100644
--- a/sound/pci/ice1712/revo.h
+++ b/sound/pci/ice1712/revo.h
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define REVO_DEVICE_DESC \
"{MidiMan M Audio,Revolution 7.1},"\
diff --git a/sound/pci/ice1712/se.c b/sound/pci/ice1712/se.c
index 69673b9..48faa01 100644
--- a/sound/pci/ice1712/se.c
+++ b/sound/pci/ice1712/se.c
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#include <asm/io.h>
#include <linux/delay.h>
@@ -70,7 +70,7 @@ struct se_spec {
* WM8740
* A 2ch-DAC of main outputs.
* It setuped as I2S mode by wire, so no way to setup from software.
- * The sample-rate are automatically changed.
+ * The sample-rate are automatically changed.
* ML/I2S (28pin) --------+
* MC/DM1 (27pin) -- 5V |
* MD/DM0 (26pin) -- GND |
@@ -314,7 +314,7 @@ static void __devinit se200pci_WM8776_init(struct snd_ice1712 *ice)
se200pci_WM8776_write(ice, 0x17, 0x000); /* reset all */
/* ADC and DAC interface is I2S 24bits mode */
- /* The sample-rate are automatically changed */
+ /* The sample-rate are automatically changed */
udelay(10);
/* BUT my board can not do reset all, so I load all by manually. */
for (i = 0; i < ARRAY_SIZE(default_values); i++)
diff --git a/sound/pci/ice1712/vt1720_mobo.c b/sound/pci/ice1712/vt1720_mobo.c
index 7f9674b..099bc98 100644
--- a/sound/pci/ice1712/vt1720_mobo.c
+++ b/sound/pci/ice1712/vt1720_mobo.c
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#include <asm/io.h>
#include <linux/delay.h>
diff --git a/sound/pci/ice1712/vt1720_mobo.h b/sound/pci/ice1712/vt1720_mobo.h
index 0b1b0ee..60c90d5 100644
--- a/sound/pci/ice1712/vt1720_mobo.h
+++ b/sound/pci/ice1712/vt1720_mobo.h
@@ -22,7 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- */
+ */
#define VT1720_MOBO_DEVICE_DESC "{Albatron,K8X800 Pro II},"\
"{Chaintech,ZNF3-150},"\
--
1.6.0.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
