Skip to contentSkip to conversation

sound/pci: coding style fixes: sound/pci/c*

PATCH In review Alexander Beregalov 1 participant 1 message Sep 9, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 6/24 sound/pci: coding style fixes: sound/pci/c*

- <asm/io.h> -> <linux/io.h>
- remove trailing whitespaces
- convert comments

Only compile tested.

---

 sound/pci/bt87x.c                      |    4 +-
 sound/pci/cmipci.c                     |   80 +++++++++++++++---------------
 sound/pci/cs4281.c                     |   82 ++++++++++++++++----------------
 sound/pci/cs5530.c                     |    8 ++--
 sound/pci/cs5535audio/cs5535audio.c    |    8 ++--
 sound/pci/cs5535audio/cs5535audio_pm.c |   12 ++--
 6 files changed, 97 insertions(+), 97 deletions(-)
sound/pci/bt87x.c +2 -2
index 3aa8d97..e9a4fad 100644
@@ -27,7 +27,7 @@
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <linux/bitops.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -603,7 +603,7 @@ static int snd_bt87x_capture_boost_get(struct snd_kcontrol *kcontrol,
 {
 	struct snd_bt87x *chip = snd_kcontrol_chip(kcontrol);
 
-	value->value.integer.value[0] = !! (chip->reg_control & CTL_A_G2X);
+	value->value.integer.value[0] = !!(chip->reg_control & CTL_A_G2X);
 	return 0;
 }
 
sound/pci/cmipci.c +40 -40

315 lines not on this page · raw message

sound/pci/cs4281.c +41 -41

276 lines not on this page · raw message

sound/pci/cs5530.c +4 -4
index 7ff8b68..2e46ac7 100644
@@ -10,8 +10,8 @@
  * simultaneously play back audio at 16bit 44100kHz, the device actually plays
  * back in the same format in which it is capturing. By forcing the chip to
  * always play/capture in 16/44100, we can let alsa-lib convert the samples and
- * that way we can hack up some full duplex audio. 
- * 
+ * that way we can hack up some full duplex audio.
+ *
  * XpressAudio(tm) is used on the Cyrix MediaGX (now NatSemi Geode) systems.
  * The older version (VSA1) provides fairly good soundblaster emulation
  * although there are a couple of bugs: large DMA buffers break record,
@@ -126,7 +126,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,
 
 	err = pci_request_regions(pci, "CS5530");
 	if (err < 0) {
-		kfree(chip); 
+		kfree(chip);
 		pci_disable_device(pci);
 		return err;
 	}
@@ -207,7 +207,7 @@ static int __devinit snd_cs5530_create(struct snd_card *card,
 		return -ENODEV;
 	}
 
-	printk(KERN_INFO "CS5530: IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8, 
+	printk(KERN_INFO "CS5530: IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8,
 									dma16);
 
 	err = snd_sbdsp_create(card, sb_base, irq, snd_sb16dsp_interrupt, dma8,
sound/pci/cs5535audio/cs5535audio.c +4 -4
index 1d8b160..07c908c 100644
@@ -27,7 +27,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
@@ -46,9 +46,9 @@ MODULE_PARM_DESC(ac97_quirk, "AC'97 board specific workarounds.");
 static struct ac97_quirk ac97_quirks[] __devinitdata = {
 #if 0 /* Not yet confirmed if all 5536 boards are HP only */
 	{
-		.subvendor = PCI_VENDOR_ID_AMD, 
-		.subdevice = PCI_DEVICE_ID_AMD_CS5536_AUDIO, 
-		.name = "AMD RDK",     
+		.subvendor = PCI_VENDOR_ID_AMD,
+		.subdevice = PCI_DEVICE_ID_AMD_CS5536_AUDIO,
+		.name = "AMD RDK",
 		.type = AC97_TUNE_HP_ONLY
 	},
 #endif
sound/pci/cs5535audio/cs5535audio_pm.c +6 -6
index 564c33b..ea67963 100644
@@ -32,18 +32,18 @@
 
 static void snd_cs5535audio_stop_hardware(struct cs5535audio *cs5535au)
 {
-	/* 
+	/*
 	we depend on snd_ac97_suspend to tell the
 	AC97 codec to shutdown. the amd spec suggests
 	that the LNK_SHUTDOWN be done at the same time
 	that the codec power-down is issued. instead,
-	we do it just after rather than at the same 
+	we do it just after rather than at the same
 	time. excluding codec specific build_ops->suspend
 	ac97 powerdown hits:
-	0x8000 EAPD 
-	0x4000 Headphone amplifier 
-	0x0300 ADC & DAC 
-	0x0400 Analog Mixer powerdown (Vref on) 
+	0x8000 EAPD
+	0x4000 Headphone amplifier
+	0x0300 ADC & DAC
+	0x0400 Analog Mixer powerdown (Vref on)
 	I am not sure if this is the best that we can do.
 	The remainder to be investigated are:
 	- analog mixer (vref off) 0x0800