Skip to contentSkip to conversation

OSS sb_card.c: no need to include mca.h

PATCH In review Adrian Bunk 3 participants 4 messages Dec 1, 2004 – Dec 3, 2004 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 OSS sb_card.c: no need to include mca.h

I didn't find any reason why this file includes mca.h .

diffstat output:

 sound/oss/sb_card.c |    3 ---
 1 files changed, 3 deletions(-)
sound/oss/sb_card.c renamed from sound/oss/sb_card.c.old +0 -3
@@ -26,9 +26,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#ifdef CONFIG_MCA
-#include <linux/mca.h>
-#endif /* CONFIG_MCA */
 #include "sound_config.h"
 #include "sb_mixer.h"
 #include "sb.h"
#1 lore raw
Quoted 2 lines · Adrian Bunk

I didn't find any reason why this file includes mca.h .

It certainly used to need it to build MCA bus soundblaster support. Whether it still does in 2.6 I don't know. I assume you tried an MCA build of OSS ?

#2 lore raw
Quoted 7 lines · Alan Cox
Quoted 2 lines · Adrian Bunk

I didn't find any reason why this file includes mca.h .

It certainly used to need it to build MCA bus soundblaster support. Whether it still does in 2.6 I don't know. I assume you tried an MCA build of OSS ?

Yes, I did.

And a

grep -ri mca sound/oss/*

only found false positives (nmcard_list, numcards).

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw

mca.h is not needed in sb_card.c in 2.6.

At one point I thought I would include the 2.4 MCA code in the sb_card.c rewrite for 2.6. The file was rewritten due to the ISAPnP interface changes that came in mid 2.5, and the ugly state of the 2.4 code. I ended up leaving the MCA code out because I didn't have any machines to test it on, and didn't know of anyone interested in testing it. It should be fairly trivial to re-integrate. It was only a few tens of lines and fairly self-contained if I recall correctly.

Note, I'm not on LKML at this time since I'm concentrating on my Master's degree.

Also, this is the correct address to reach me at, as noted at the top of sb_card.c. Linus rejected my CREDITS file patches the last few times I sent them in, so the address there is invalid.

-Paul

Quoted 20 lines · Adrian Bunk
Quoted 7 lines · Alan Cox
Quoted 2 lines · Adrian Bunk

I didn't find any reason why this file includes mca.h .

It certainly used to need it to build MCA bus soundblaster support. Whether it still does in 2.6 I don't know. I assume you tried an MCA build of OSS ?

Yes, I did.

And a

grep -ri mca sound/oss/*

only found false positives (nmcard_list, numcards).

cu
Adrian

Signature · 1 line
Paul Laufer <[email protected]>