Skip to contentSkip to conversation

sound/pci/: remove duplicate #include's

PATCH In review Adrian Bunk 2 participants 3 messages Apr 17, 2006 – Apr 18, 2006

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

PATCH 1/1 sound/pci/: remove duplicate #include's

There's no reason for #include'ing linux/dma-mapping.h more than once.

---

 sound/pci/ad1889.c           |    1 -
 sound/pci/emu10k1/emu10k1x.c |    1 -
 sound/pci/es1968.c           |    1 -
 sound/pci/ice1712/ice1712.c  |    1 -
 sound/pci/maestro3.c         |    1 -
 sound/pci/mixart/mixart.c    |    1 -
 sound/pci/pcxhr/pcxhr.c      |    1 -
 7 files changed, 7 deletions(-)
sound/pci/ad1889.c renamed from sound/pci/ad1889.c.old +0 -1
@@ -37,11 +37,10 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>
sound/pci/emu10k1/emu10k1x.c renamed from sound/pci/emu10k1/emu10k1x.c.old +0 -1
@@ -34,11 +34,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
sound/pci/es1968.c renamed from sound/pci/es1968.c.old +0 -1
@@ -102,11 +102,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <linux/mutex.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/mpu401.h>
sound/pci/ice1712/ice1712.c renamed from sound/pci/ice1712/ice1712.c.old +0 -1
@@ -54,11 +54,10 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <linux/mutex.h>
 
 #include <sound/core.h>
 #include <sound/cs8427.h>
 #include <sound/info.h>
sound/pci/maestro3.c renamed from sound/pci/maestro3.c.old +0 -1
@@ -39,11 +39,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/mpu401.h>
sound/pci/mixart/mixart.c renamed from sound/pci/mixart/mixart.c.old +0 -1
@@ -26,11 +26,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/info.h>
 #include <sound/control.h>
sound/pci/pcxhr/pcxhr.c renamed from sound/pci/pcxhr/pcxhr.c.old +0 -1
@@ -28,11 +28,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/info.h>
 #include <sound/control.h>

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642

#1 lore raw

At Mon, 17 Apr 2006 03:03:41 +0200,

Quoted 2 lines · Adrian Bunk

There's no reason for #include'ing linux/dma-mapping.h more than once.

Looks like a side-effect of a weird merge at some stage. I'll apply it to ALSA tree.

Thanks,

Takashi

Quoted 115 lines

---

 sound/pci/ad1889.c           |    1 -
 sound/pci/emu10k1/emu10k1x.c |    1 -
 sound/pci/es1968.c           |    1 -
 sound/pci/ice1712/ice1712.c  |    1 -
 sound/pci/maestro3.c         |    1 -
 sound/pci/mixart/mixart.c    |    1 -
 sound/pci/pcxhr/pcxhr.c      |    1 -
 7 files changed, 7 deletions(-)
sound/pci/ad1889.c renamed from sound/pci/ad1889.c.old +0 -1
@@ -37,11 +37,10 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>
sound/pci/emu10k1/emu10k1x.c renamed from sound/pci/emu10k1/emu10k1x.c.old +0 -1
@@ -34,11 +34,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
sound/pci/es1968.c renamed from sound/pci/es1968.c.old +0 -1
@@ -102,11 +102,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <linux/mutex.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/mpu401.h>
sound/pci/ice1712/ice1712.c renamed from sound/pci/ice1712/ice1712.c.old +0 -1
@@ -54,11 +54,10 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <linux/mutex.h>
 
 #include <sound/core.h>
 #include <sound/cs8427.h>
 #include <sound/info.h>
sound/pci/maestro3.c renamed from sound/pci/maestro3.c.old +0 -1
@@ -39,11 +39,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/mpu401.h>
sound/pci/mixart/mixart.c renamed from sound/pci/mixart/mixart.c.old +0 -1
@@ -26,11 +26,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/info.h>
 #include <sound/control.h>
sound/pci/pcxhr/pcxhr.c renamed from sound/pci/pcxhr/pcxhr.c.old +0 -2
@@ -28,11 +28,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/info.h>
 #include <sound/control.h>
 
 
-------------------------------------------------------
Quoted 9 lines

This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642

#2 lore raw
In reply to Adrian Bunk

At Mon, 17 Apr 2006 03:03:41 +0200,

Quoted 2 lines · Adrian Bunk

There's no reason for #include'ing linux/dma-mapping.h more than once.

Looks like a side-effect of a weird merge at some stage. I'll apply it to ALSA tree.

Thanks,

Takashi

Quoted 124 lines

---

 sound/pci/ad1889.c           |    1 -
 sound/pci/emu10k1/emu10k1x.c |    1 -
 sound/pci/es1968.c           |    1 -
 sound/pci/ice1712/ice1712.c  |    1 -
 sound/pci/maestro3.c         |    1 -
 sound/pci/mixart/mixart.c    |    1 -
 sound/pci/pcxhr/pcxhr.c      |    1 -
 7 files changed, 7 deletions(-)
sound/pci/ad1889.c renamed from sound/pci/ad1889.c.old +0 -1
@@ -37,11 +37,10 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/compiler.h>
 #include <linux/delay.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>
sound/pci/emu10k1/emu10k1x.c renamed from sound/pci/emu10k1/emu10k1x.c.old +0 -1
@@ -34,11 +34,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
sound/pci/es1968.c renamed from sound/pci/es1968.c.old +0 -1
@@ -102,11 +102,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <linux/mutex.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/mpu401.h>
sound/pci/ice1712/ice1712.c renamed from sound/pci/ice1712/ice1712.c.old +0 -1
@@ -54,11 +54,10 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <linux/mutex.h>
 
 #include <sound/core.h>
 #include <sound/cs8427.h>
 #include <sound/info.h>
sound/pci/maestro3.c renamed from sound/pci/maestro3.c.old +0 -1
@@ -39,11 +39,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
-#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/mpu401.h>
sound/pci/mixart/mixart.c renamed from sound/pci/mixart/mixart.c.old +0 -1
@@ -26,11 +26,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/info.h>
 #include <sound/control.h>
sound/pci/pcxhr/pcxhr.c renamed from sound/pci/pcxhr/pcxhr.c.old +0 -2
@@ -28,11 +28,10 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
-#include <linux/dma-mapping.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/info.h>
 #include <sound/control.h>
 
 
-------------------------------------------------------

This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel