[PATCH] Obsolete config in kernel source (USE_MIXARTLOADER)

[PATCH] Obsolete config in kernel source (USE_MIXARTLOADER)

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 666 bytes --]

Hi all!

	As part of the VAMOS[0] research project at the University of
Erlangen we're checking referential integrity between kernel KConfig
options and in-code Conditional blocks.

	The config Variable USE_MIXARTLOADER has been non-existent for
all git based linux kernels (2.6.12-rc) and seems to be no longer
relevant. It is only referenced at one place in the Code
(sound/pci/mixart/mixart_hwdep.c).

	The attached patch makes the behaviour more obvious as it is
equivalent to the old one when assuming CONFIG_MIXARTLOADER as not
defined.

	Please keep me informed of this patch getting confirmed /
merged so we can keep track of it.

Regards

	Christoph Egger


[-- Attachment #2: 0001-config-USE_MIXARTLOADER-has-never-existed-in-KConfig.patch --]
[-- Type: text/x-diff, Size: 1133 bytes --]

>From 974a2f370b3401e948821bae47c3e9edb1b21a5e Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Date: Wed, 20 Jan 2010 14:23:47 +0100
Subject: [PATCH] config USE_MIXARTLOADER has never existed in KConfig for 2.6 linux
 kernels so this part of the check always evaluates to true thus
 removing the part of the check.


Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
---
 sound/pci/mixart/mixart_hwdep.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 4cf4cd8..ef39a58 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -545,7 +545,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
 
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_MIXARTLOADER) && !defined(CONFIG_SND_MIXART) /* built-in kernel */
+#if !defined(CONFIG_SND_MIXART) /* built-in kernel */
 #define SND_MIXART_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
-- 
1.6.3.3

Re: [PATCH] Obsolete config in kernel source (USE_MIXARTLOADER)

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 868 bytes --]

On Wed, Jan 20, 2010 at 02:31:44PM +0100, Christoph Egger wrote:
> Hi all!
> 
> 	As part of the VAMOS[0] research project at the University of
> Erlangen we're checking referential integrity between kernel KConfig
> options and in-code Conditional blocks.
> 
> 	The config Variable USE_MIXARTLOADER has been non-existent for
> all git based linux kernels (2.6.12-rc) and seems to be no longer
> relevant. It is only referenced at one place in the Code
> (sound/pci/mixart/mixart_hwdep.c).
> 
> 	The attached patch makes the behaviour more obvious as it is
> equivalent to the old one when assuming CONFIG_MIXARTLOADER as not
> defined.
> 
> 	Please keep me informed of this patch getting confirmed /
> merged so we can keep track of it.

	Same is, of course, true for USE_PCXHRLOADER. Attached is a
patch doing the same for both of them.
 
Regards

	Christoph Egger



[-- Attachment #2: 0001-config-USE_MIXARTLOADER-has-never-existed-in-KConfig.patch --]
[-- Type: text/x-diff, Size: 1707 bytes --]

>From 5a6f78fb03278e0f825be74c94546a7d05c222df Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Date: Wed, 20 Jan 2010 14:23:47 +0100
Subject: [PATCH] config USE_MIXARTLOADER has never existed in KConfig for 2.6 linux
 kernels so this part of the check always evaluates to true thus
 removing the part of the check.

The same is true for USE_PCXHRLOADER

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
---
 sound/pci/mixart/mixart_hwdep.c |    2 +-
 sound/pci/pcxhr/pcxhr_hwdep.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 4cf4cd8..ef39a58 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -545,7 +545,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
 
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_MIXARTLOADER) && !defined(CONFIG_SND_MIXART) /* built-in kernel */
+#if !defined(CONFIG_SND_MIXART) /* built-in kernel */
 #define SND_MIXART_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 17cb123..16152ce 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -35,7 +35,7 @@
 
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_PCXHRLOADER) && !defined(CONFIG_SND_PCXHR) /* built-in kernel */
+#if !defined(CONFIG_SND_PCXHR) /* built-in kernel */
 #define SND_PCXHR_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
-- 
1.6.3.3

Re: [PATCH] Obsolete config in kernel source (USE_MIXARTLOADER)

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 894 bytes --]

On Wed, Jan 20, 2010 at 02:31:44PM +0100, Christoph Egger wrote:
> Hi all!
> 
> 	As part of the VAMOS[0] research project at the University of
> Erlangen we're checking referential integrity between kernel KConfig
> options and in-code Conditional blocks.
> 
> 	The config Variable USE_MIXARTLOADER has been non-existent for
> all git based linux kernels (2.6.12-rc) and seems to be no longer
> relevant. It is only referenced at one place in the Code
> (sound/pci/mixart/mixart_hwdep.c).
> 
> 	The attached patch makes the behaviour more obvious as it is
> equivalent to the old one when assuming CONFIG_MIXARTLOADER as not
> defined.
> 
> 	Please keep me informed of this patch getting confirmed /
> merged so we can keep track of it.

	Sorry, it seems I'm a bit unconcentrated today there are three
of them actually. Attached the new patch fixing all 3 of them.

Regards

	Christoph Egger



[-- Attachment #2: 0001-config-USE_MIXARTLOADER-has-never-existed-in-KConfig.patch --]
[-- Type: text/x-diff, Size: 2261 bytes --]

>From 9039fdcb025eb8794ffee7844aab5da6bb917979 Mon Sep 17 00:00:00 2001
From: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Date: Wed, 20 Jan 2010 14:23:47 +0100
Subject: [PATCH] config USE_MIXARTLOADER has never existed in KConfig for 2.6 linux
 kernels so this part of the check always evaluates to true thus
 removing the part of the check.

The same is true for USE_PCXHRLOADER and USE_VXLOADER

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
---
 include/sound/vx_core.h         |    2 +-
 sound/pci/mixart/mixart_hwdep.c |    2 +-
 sound/pci/pcxhr/pcxhr_hwdep.c   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index 5456343..c6835dd 100644
--- a/include/sound/vx_core.h
+++ b/include/sound/vx_core.h
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_VXLOADER) && !defined(CONFIG_SND_VX_LIB) /* built-in kernel */
+#if !defined(CONFIG_SND_VX_LIB) /* built-in kernel */
 #define SND_VX_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
diff --git a/sound/pci/mixart/mixart_hwdep.c b/sound/pci/mixart/mixart_hwdep.c
index 4cf4cd8..ef39a58 100644
--- a/sound/pci/mixart/mixart_hwdep.c
+++ b/sound/pci/mixart/mixart_hwdep.c
@@ -545,7 +545,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
 
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_MIXARTLOADER) && !defined(CONFIG_SND_MIXART) /* built-in kernel */
+#if !defined(CONFIG_SND_MIXART) /* built-in kernel */
 #define SND_MIXART_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index 17cb123..16152ce 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -35,7 +35,7 @@
 
 
 #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE)
-#if !defined(CONFIG_USE_PCXHRLOADER) && !defined(CONFIG_SND_PCXHR) /* built-in kernel */
+#if !defined(CONFIG_SND_PCXHR) /* built-in kernel */
 #define SND_PCXHR_FW_LOADER	/* use the standard firmware loader */
 #endif
 #endif
-- 
1.6.3.3

Re: [PATCH] Obsolete config in kernel source (USE_MIXARTLOADER)

[Takashi Iwai]

At Wed, 20 Jan 2010 14:31:44 +0100,
Christoph Egger wrote:
> 
> Hi all!
> 
> 	As part of the VAMOS[0] research project at the University of
> Erlangen we're checking referential integrity between kernel KConfig
> options and in-code Conditional blocks.
> 
> 	The config Variable USE_MIXARTLOADER has been non-existent for
> all git based linux kernels (2.6.12-rc) and seems to be no longer
> relevant. It is only referenced at one place in the Code
> (sound/pci/mixart/mixart_hwdep.c).
> 
> 	The attached patch makes the behaviour more obvious as it is
> equivalent to the old one when assuming CONFIG_MIXARTLOADER as not
> defined.

Well, these all are basically hacks for building modules from the
external alsa-driver tree.  Since this is fairly harmless, I'd like to
keep them.


thanks,

Takashi