[2.6 patch] sound/: possible cleanups

[2.6 patch] sound/: possible cleanups

[Adrian Bunk]

This patch contains the following possible cleanups:
- core/init.c: make the needlessly global snd_generic_device_release()
  static
- pci/hda/hda_proc.c should #include "hda_local.h" for including the
  prototype of it's global function snd_hda_codec_proc_new()
- core/rawmidi.c: make the needlessly global and EXPORT_SYMBOL'ed
  function snd_rawmidi_info() static


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

---

 sound/core/init.c        |    2 +-
 sound/core/rawmidi.c     |    4 ++--
 sound/pci/hda/hda_proc.c |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

--- linux-2.6.15-rc1-mm2-full/sound/core/rawmidi.c.old	2005-11-22 22:37:15.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/sound/core/rawmidi.c	2005-11-22 22:37:45.000000000 +0100
@@ -528,7 +528,8 @@
 	return err;
 }
 
-int snd_rawmidi_info(snd_rawmidi_substream_t *substream, snd_rawmidi_info_t *info)
+static int snd_rawmidi_info(snd_rawmidi_substream_t *substream,
+			    snd_rawmidi_info_t *info)
 {
 	snd_rawmidi_t *rmidi;
 	
@@ -1672,7 +1673,6 @@
 EXPORT_SYMBOL(snd_rawmidi_transmit);
 EXPORT_SYMBOL(snd_rawmidi_new);
 EXPORT_SYMBOL(snd_rawmidi_set_ops);
-EXPORT_SYMBOL(snd_rawmidi_info);
 EXPORT_SYMBOL(snd_rawmidi_info_select);
 EXPORT_SYMBOL(snd_rawmidi_kernel_open);
 EXPORT_SYMBOL(snd_rawmidi_kernel_release);
--- linux-2.6.15-rc1-mm2-full/sound/core/init.c.old	2005-11-22 22:38:41.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/sound/core/init.c	2005-11-22 22:39:09.000000000 +0100
@@ -694,7 +694,7 @@
 	},
 };
 
-void snd_generic_device_release(struct device *dev)
+static void snd_generic_device_release(struct device *dev)
 {
 }
 
--- linux-2.6.15-rc1-mm2-full/sound/pci/hda/hda_proc.c.old	2005-11-22 22:41:36.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/sound/pci/hda/hda_proc.c	2005-11-22 22:41:48.000000000 +0100
@@ -26,6 +26,7 @@
 #include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
+#include "hda_local.h"
 
 static const char *get_wid_type_name(unsigned int wid_value)
 {

Re: [Alsa-devel] [2.6 patch] sound/: possible cleanups

[Takashi Iwai]

At Wed, 23 Nov 2005 01:44:06 +0100,
Adrian Bunk wrote:
> 
> This patch contains the following possible cleanups:
> - core/init.c: make the needlessly global snd_generic_device_release()
>   static
> - pci/hda/hda_proc.c should #include "hda_local.h" for including the
>   prototype of it's global function snd_hda_codec_proc_new()
> - core/rawmidi.c: make the needlessly global and EXPORT_SYMBOL'ed
>   function snd_rawmidi_info() static
> 
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

Thanks.

I'll apply manually to the latest ALSA tree since the ALSA kernel code
has been changed very much since ALSA-1.0.10 release.


Takashi