ALSA: remove the main version information

Remove the main ALSA version number from the kernel ALSA driver.
The ALSA driver package release diverges from the upstream. This may
confuse users to see the same ALSA version for many kernel releases
and this version lost it's original purpose and connection.

The "ioctl" APIs have own version numbers, so the user space may check
for specific API changes only.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/include/sound/version.h b/include/sound/version.h
deleted file mode 100644 (file)
index cc75024..0000000
--- a/include/sound/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* include/version.h */
-#define CONFIG_SND_VERSION "1.0.25"
-#define CONFIG_SND_DATE ""

diff --git a/sound/core/info.c b/sound/core/info.c
index c1e611c65c8fc3308cf6e005cc36688b164c1a55..6b368d25073b154d34b8258d59b509a1ffb6c6d2 100644 (file)
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -28,7 +28,7 @@
 #include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/info.h>
-#include <sound/version.h>
+#include <linux/utsname.h>
 #include <linux/proc_fs.h>
 #include <linux/mutex.h>
 #include <stdarg.h>
@@ -986,9 +986,8 @@ static struct snd_info_entry *snd_info_version_entry;
 static void snd_info_version_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
        snd_iprintf(buffer,
-                   "Advanced Linux Sound Architecture Driver Version "
-                   CONFIG_SND_VERSION CONFIG_SND_DATE ".\n"
-                  );
+                   "Advanced Linux Sound Architecture Driver Version k%s.\n",
+                   init_utsname()->release);
 }
 
 static int __init snd_info_version_init(void)

diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index cf42ab5080eb59eb495fa4ae617b98085c26d057..83c29dbff9c00fda9124c5155db62fa59341f6a4 100644 (file)
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -26,7 +26,6 @@
 #include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/info.h>
-#include <sound/version.h>
 #include <linux/utsname.h>
 #include <linux/mutex.h>
 
@@ -94,7 +93,7 @@ static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int d
 static void snd_sndstat_proc_read(struct snd_info_entry *entry,
                                  struct snd_info_buffer *buffer)
 {
-       snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");
+       snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA emulation code)\n");
        snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n",
                    init_utsname()->sysname,
                    init_utsname()->nodename,

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 28f35593a750464b87306a5c4355d98333856e36..643976000ce825d1857fd3a3192fadeff0da4e5b 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -27,7 +27,6 @@
 #include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/info.h>
-#include <sound/version.h>
 #include <sound/control.h>
 #include <sound/initval.h>
 #include <linux/kmod.h>
@@ -468,7 +467,7 @@ static int __init alsa_sound_init(void)
        }
        snd_info_minor_register();
 #ifndef MODULE
-       printk(KERN_INFO "Advanced Linux Sound Architecture Driver Version " CONFIG_SND_VERSION CONFIG_SND_DATE ".\n");
+       printk(KERN_INFO "Advanced Linux Sound Architecture Driver Initialized.\n");
 #endif
        return 0;
 }