Skip to contentSkip to conversation

ice1712 drivers coding style fixes (part 2)

PATCH In review Vedran Miletić 2 participants 4 messages Sep 7, 2008 – Sep 8, 2008 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ice1712 drivers coding style fixes (part 2)

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.

Signature · 1 line
Vedran Miletić

From 3f2e00c4fcb1f9dbebcdc00a6b9209140b6cffb0 Mon Sep 17 00:00:00 2001
From: Vedran Miletic <[email protected]>
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).

---
 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(-)
sound/pci/ice1712/ak4xxx.c +9 -7
index 03391da..4caff20 100644
@@ -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)
 
sound/pci/ice1712/amp.c +5 -4
index 3756430..8c4478e 100644
@@ -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;
 }
 
sound/pci/ice1712/amp.h +7 -4
index bf81d30..fb8f6c4 100644
@@ -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
sound/pci/ice1712/aureon.h +1 -1
index c253b8e..098792a 100644
@@ -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},"\
sound/pci/ice1712/delta.c +1 -1
index d216362..8efd8f5 100644
@@ -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>
sound/pci/ice1712/delta.h +1 -1
index f7f14df..5bff36a 100644
@@ -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},"\
sound/pci/ice1712/envy24ht.h +12 -10
index a0c5e00..cafb055 100644
@@ -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
  */
 
sound/pci/ice1712/ews.h +1 -1
index 1c44371..1b478cf 100644
@@ -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},"\
sound/pci/ice1712/hoontech.h +1 -1
index cc1da1e..a37a087 100644
@@ -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}," \
sound/pci/ice1712/ice1724.c +0 -1
index e8aabe6..844ec70 100644
@@ -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 |
sound/pci/ice1712/juli.c +1 -1
index c51659b..c680ce3 100644
@@ -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);
sound/pci/ice1712/pontis.c +7 -7
index 6bc3f91..770cca9 100644
@@ -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;
 
sound/pci/ice1712/pontis.h +3 -2
index d0d1378..05ebd28 100644
@@ -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[];
 
sound/pci/ice1712/prodigy_hifi.c +74 -69

318 lines not on this page · raw message

sound/pci/ice1712/prodigy_hifi.h +5 -6
index a4415d4..45fcfe2 100644
@@ -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 <[email protected]>
  *
@@ -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 */
sound/pci/ice1712/revo.c +6 -5
index b508bb3..be756bd 100644
@@ -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);
sound/pci/ice1712/revo.h +1 -1
index a3ba425..8685ac5 100644
@@ -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},"\
sound/pci/ice1712/se.c +3 -3
index 69673b9..48faa01 100644
@@ -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++)
sound/pci/ice1712/vt1720_mobo.c +1 -1
index 7f9674b..099bc98 100644
@@ -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>
sound/pci/ice1712/vt1720_mobo.h +1 -1
index 0b1b0ee..60c90d5 100644
@@ -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},"\
Signature · 1 line
1.6.0.1

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#1 lore raw

At Sun, 7 Sep 2008 17:07:39 +0200,

Quoted 2 lines · =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:

I started with Takashi's sound-unstable tree as a base:

Oh, please base on sound-2.6 tree. The unstable tree is really unstable, not for upstream merge.

Quoted 2 lines

Fixed:
* ice1724 compilation error (one { too much)

Well, I already applied your first one, so this version conflicts. Please re-create from the latest sound-2.6.git tree.

thanks,

Takashi

#2 lore raw

2008/9/8 Takashi Iwai <[email protected]>:

Quoted 7 lines

At Sun, 7 Sep 2008 17:07:39 +0200,

Quoted 2 lines · =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:

I started with Takashi's sound-unstable tree as a base:

Oh, please base on sound-2.6 tree. The unstable tree is really unstable, not for upstream merge.

Ok, thanks for clarification. Will do.

Quoted 6 lines
Quoted 3 lines

Fixed:
* ice1724 compilation error (one { too much)

Well, I already applied your first one, so this version conflicts. Please re-create from the latest sound-2.6.git tree.

I know this isn't a place to ask for git lessons, but is there a way to do it semi-automagically with git?

Quoted 5 lines

thanks,

Takashi

Signature · 5 lines
Vedran Miletić
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#3 lore raw

At Mon, 8 Sep 2008 19:41:11 +0200,

Quoted 11 lines · =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:

2008/9/8 Takashi Iwai <[email protected]>:

Quoted 7 lines

At Sun, 7 Sep 2008 17:07:39 +0200,

Quoted 2 lines · =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote:

I started with Takashi's sound-unstable tree as a base:

Oh, please base on sound-2.6 tree. The unstable tree is really unstable, not for upstream merge.

Ok, thanks for clarification. Will do.

Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Fixed:
* ice1724 compilation error (one { too much)

Well, I already applied your first one, so this version conflicts. Please re-create from the latest sound-2.6.git tree.

I know this isn't a place to ask for git lessons, but is there a way to do it semi-automagically with git?

Usually, pull the upstream, and rebase your changes onto it. In your case, just doing git-cherry-pick would suffice because it's a single patch anyway.

Takashi