public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [RFC: 2.6 patch] build sound/sound_firmware.c only for OSS
@ 2006-08-22 14:46 Adrian Bunk
  0 siblings, 0 replies; 4+ messages in thread
From: Adrian Bunk @ 2006-08-22 14:46 UTC (permalink / raw)
  To: alsa-devel, linux-kernel, Alan Cox

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.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 sound/Makefile         |    3 ++-
 sound/sound_core.c     |    4 ----
 sound/sound_firmware.c |    3 +++
 3 files changed, 5 insertions(+), 5 deletions(-)

--- linux-2.6.18-rc4-mm2/sound/Makefile.old	2006-08-22 00:07:41.000000000 +0200
+++ linux-2.6.18-rc4-mm2/sound/Makefile	2006-08-22 00:10:41.000000000 +0200
@@ -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
--- linux-2.6.18-rc4-mm2/sound/sound_core.c.old	2006-08-22 00:09:13.000000000 +0200
+++ linux-2.6.18-rc4-mm2/sound/sound_core.c	2006-08-22 00:12:10.000000000 +0200
@@ -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");
--- linux-2.6.18-rc4-mm2/sound/sound_firmware.c.old	2006-08-22 00:10:53.000000000 +0200
+++ linux-2.6.18-rc4-mm2/sound/sound_firmware.c	2006-08-22 00:26:03.000000000 +0200
@@ -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");


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [RFC: 2.6 patch] build sound/sound_firmware.c only for OSS
@ 2006-09-04 11:41 Adrian Bunk
  2006-09-04 12:11 ` Alan Cox
  2006-09-05 12:26 ` [Alsa-devel] " Takashi Iwai
  0 siblings, 2 replies; 4+ messages in thread
From: Adrian Bunk @ 2006-09-04 11:41 UTC (permalink / raw)
  To: Andrew Morton; +Cc: alsa-devel, linux-kernel, Alan Cox

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.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

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(-)

--- linux-2.6.18-rc4-mm2/sound/Makefile.old	2006-08-22 00:07:41.000000000 +0200
+++ linux-2.6.18-rc4-mm2/sound/Makefile	2006-08-22 00:10:41.000000000 +0200
@@ -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
--- linux-2.6.18-rc4-mm2/sound/sound_core.c.old	2006-08-22 00:09:13.000000000 +0200
+++ linux-2.6.18-rc4-mm2/sound/sound_core.c	2006-08-22 00:12:10.000000000 +0200
@@ -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");
--- linux-2.6.18-rc4-mm2/sound/sound_firmware.c.old	2006-08-22 00:10:53.000000000 +0200
+++ linux-2.6.18-rc4-mm2/sound/sound_firmware.c	2006-08-22 00:26:03.000000000 +0200
@@ -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");


-- 
VGER BF report: U 0.49999

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [RFC: 2.6 patch] build sound/sound_firmware.c only for OSS
  2006-09-04 11:41 [RFC: 2.6 patch] build sound/sound_firmware.c only for OSS Adrian Bunk
@ 2006-09-04 12:11 ` Alan Cox
  2006-09-05 12:26 ` [Alsa-devel] " Takashi Iwai
  1 sibling, 0 replies; 4+ messages in thread
From: Alan Cox @ 2006-09-04 12:11 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Andrew Morton, alsa-devel, linux-kernel

Ar Llu, 2006-09-04 am 13:41 +0200, ysgrifennodd 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.

Reminds me - might as well fix this too

Signed-off-by: Alan Cox <alan@redhat.com>

--- sound/sound_firmware.c~	2006-09-04 12:33:08.805282488 +0100
+++ sound/sound_firmware.c	2006-09-04 12:33:08.817280664 +0100
@@ -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)


-- 
VGER BF report: H 2.96182e-15

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Alsa-devel] [RFC: 2.6 patch] build sound/sound_firmware.c only for OSS
  2006-09-04 11:41 [RFC: 2.6 patch] build sound/sound_firmware.c only for OSS Adrian Bunk
  2006-09-04 12:11 ` Alan Cox
@ 2006-09-05 12:26 ` Takashi Iwai
  1 sibling, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2006-09-05 12:26 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: Andrew Morton, alsa-devel, linux-kernel, Alan Cox

At Mon, 4 Sep 2006 13:41:35 +0200,
Adrian Bunk wrote:
> 
> 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.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

Thanks, it's good for us.

Acked-by: Takashi Iwai <tiwai@suse.de>


Takashi

> 
> ---
> 
> 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(-)
> 
> --- linux-2.6.18-rc4-mm2/sound/Makefile.old	2006-08-22 00:07:41.000000000 +0200
> +++ linux-2.6.18-rc4-mm2/sound/Makefile	2006-08-22 00:10:41.000000000 +0200
> @@ -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
> --- linux-2.6.18-rc4-mm2/sound/sound_core.c.old	2006-08-22 00:09:13.000000000 +0200
> +++ linux-2.6.18-rc4-mm2/sound/sound_core.c	2006-08-22 00:12:10.000000000 +0200
> @@ -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");
> --- linux-2.6.18-rc4-mm2/sound/sound_firmware.c.old	2006-08-22 00:10:53.000000000 +0200
> +++ linux-2.6.18-rc4-mm2/sound/sound_firmware.c	2006-08-22 00:26:03.000000000 +0200
> @@ -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
> Alsa-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/alsa-devel
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2006-09-05 12:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-04 11:41 [RFC: 2.6 patch] build sound/sound_firmware.c only for OSS Adrian Bunk
2006-09-04 12:11 ` Alan Cox
2006-09-05 12:26 ` [Alsa-devel] " Takashi Iwai
  -- strict thread matches above, loose matches on Subject: below --
2006-08-22 14:46 Adrian Bunk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox