Skip to contentSkip to conversation

build sound/sound_firmware.c only for OSS

RFC PATCH In review Adrian Bunk 3 participants 3 messages Sep 4, 2006 – Sep 5, 2006 Sound

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 build sound/sound_firmware.c only for OSS

All sound/sound_firmware.c contains is mod_firmware_load() that is a legacy API only used by some OSS drivers.

This patch builds it into an own sound_firmware module that is only built depending on CONFIG_SOUND_PRIME making the kernel slightly smaller for ALSA users.

---

This patch was already sent on:
- 22 Aug 2006

 sound/Makefile         |    3 ++-
 sound/sound_core.c     |    4 ----
 sound/sound_firmware.c |    3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)
sound/Makefile renamed from sound/Makefile.old +2 -1
@@ -2,6 +2,7 @@
 #
 
 obj-$(CONFIG_SOUND) += soundcore.o
+obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_DMASOUND) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/
@@ -11,4 +12,4 @@
   obj-y += last.o
 endif
 
-soundcore-objs  := sound_core.o sound_firmware.o
+soundcore-objs  := sound_core.o
sound/sound_core.c renamed from sound/sound_core.c.old +0 -4
@@ -517,10 +517,6 @@
 	return -ENODEV;
 }
 
-extern int mod_firmware_load(const char *, char **);
-EXPORT_SYMBOL(mod_firmware_load);
-
-
 MODULE_DESCRIPTION("Core sound module");
 MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
sound/sound_firmware.c renamed from sound/sound_firmware.c.old +3 -0
@@ -4,6 +4,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
+#include "oss/sound_firmware.h"
 
 static int do_mod_firmware_load(const char *fn, char **fp)
 {
@@ -73,4 +74,6 @@
 	set_fs(fs);
 	return r;
 }
+EXPORT_SYMBOL(mod_firmware_load);
 
+MODULE_LICENSE("GPL");

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

#1 lore raw

Ar Llu, 2006-09-04 am 13:41 +0200, ysgrifennodd Adrian Bunk:

Quoted 6 lines

All sound/sound_firmware.c contains is mod_firmware_load() that is a legacy API only used by some OSS drivers.

This patch builds it into an own sound_firmware module that is only built depending on CONFIG_SOUND_PRIME making the kernel slightly smaller for ALSA users.

Reminds me - might as well fix this too

sound_firmware.c renamed from sound_firmware.c~ +1 -2
@@ -59,8 +59,7 @@
  *	value zero on a failure.
  *
  *	Caution: This API is not recommended. Firmware should be loaded via
- *	an ioctl call and a setup application. This function may disappear
- *	in future.
+ *	request_firmware.
  */
  
 int mod_firmware_load(const char *fn, char **fp)

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Acked-by on v1 1/1
#2 lore raw
In reply to Adrian Bunk

At Mon, 4 Sep 2006 13:41:35 +0200,

Quoted 9 lines · Adrian Bunk

All sound/sound_firmware.c contains is mod_firmware_load() that is a legacy API only used by some OSS drivers.

This patch builds it into an own sound_firmware module that is only built depending on CONFIG_SOUND_PRIME making the kernel slightly smaller for ALSA users.

Thanks, it's good for us.

Takashi

Quoted 69 lines

---

This patch was already sent on:
- 22 Aug 2006

 sound/Makefile         |    3 ++-
 sound/sound_core.c     |    4 ----
 sound/sound_firmware.c |    3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)
sound/Makefile renamed from sound/Makefile.old +2 -1
@@ -2,6 +2,7 @@
 #
 
 obj-$(CONFIG_SOUND) += soundcore.o
+obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
 obj-$(CONFIG_SOUND_PRIME) += oss/
 obj-$(CONFIG_DMASOUND) += oss/
 obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/
@@ -11,4 +12,4 @@
   obj-y += last.o
 endif
 
-soundcore-objs  := sound_core.o sound_firmware.o
+soundcore-objs  := sound_core.o
sound/sound_core.c renamed from sound/sound_core.c.old +0 -4
@@ -517,10 +517,6 @@
 	return -ENODEV;
 }
 
-extern int mod_firmware_load(const char *, char **);
-EXPORT_SYMBOL(mod_firmware_load);
-
-
 MODULE_DESCRIPTION("Core sound module");
 MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
sound/sound_firmware.c renamed from sound/sound_firmware.c.old +3 -1
@@ -4,6 +4,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <asm/uaccess.h>
+#include "oss/sound_firmware.h"
 
 static int do_mod_firmware_load(const char *fn, char **fp)
 {
@@ -73,4 +74,6 @@
 	set_fs(fs);
 	return r;
 }
+EXPORT_SYMBOL(mod_firmware_load);
 
+MODULE_LICENSE("GPL");
 
 
-------------------------------------------------------------------------

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel