[PATCH] Remove logically superfluous comparisons from Kconfig files.

[PATCH] Remove logically superfluous comparisons from Kconfig files.

[Robert P. J. Day]

  Remove Kconfig comparisons of the form FUBAR || FUBAR=n, since they
appear to be superfluous.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

---

  based on what i read in kconfig-language.txt, it would *appear* that
those comparisons are redundant, but i'm willing to be convinced
otherwise.  (unless the developer specifically wanted the case of
"!=m", which i'm fairly sure is not the same thing, yes?)



 drivers/char/drm/Kconfig   |    2 +-
 fs/dlm/Kconfig             |    1 -
 net/ipv4/netfilter/Kconfig |    1 -
 net/sctp/Kconfig           |    1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index ef833a1..d681e68 100644
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -6,7 +6,7 @@
 #
 config DRM
 	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
-	depends on (AGP || AGP=n) && PCI
+	depends on && PCI
 	help
 	  Kernel-level support for the Direct Rendering Infrastructure (DRI)
 	  introduced in XFree86 4.0. If you say Y here, you need to select
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig
index b5654a2..7cf868a 100644
--- a/fs/dlm/Kconfig
+++ b/fs/dlm/Kconfig
@@ -3,7 +3,6 @@ menu "Distributed Lock Manager"

 config DLM
 	tristate "Distributed Lock Manager (DLM)"
-	depends on IPV6 || IPV6=n
 	select CONFIGFS_FS
 	select IP_SCTP if DLM_SCTP
 	help
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index f6026d4..92b1bba 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -78,7 +78,6 @@ config IP_NF_CONNTRACK_NETLINK
 	tristate 'Connection tracking netlink interface (EXPERIMENTAL)'
 	depends on EXPERIMENTAL && IP_NF_CONNTRACK && NETFILTER_NETLINK
 	depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m
-	depends on IP_NF_NAT=n || IP_NF_NAT
 	help
 	  This option enables support for a netlink-based userspace interface

diff --git a/net/sctp/Kconfig b/net/sctp/Kconfig
index 9cba49e..4edf997 100644
--- a/net/sctp/Kconfig
+++ b/net/sctp/Kconfig
@@ -7,7 +7,6 @@ menu "SCTP Configuration (EXPERIMENTAL)"

 config IP_SCTP
 	tristate "The SCTP Protocol (EXPERIMENTAL)"
-	depends on IPV6 || IPV6=n
 	select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_SHA1 if SCTP_HMAC_SHA1

Re: [PATCH] Remove logically superfluous comparisons from Kconfig files.

[Russell King]

On Mon, Dec 18, 2006 at 05:14:01AM -0500, Robert P. J. Day wrote:
>   Remove Kconfig comparisons of the form FUBAR || FUBAR=n, since they
> appear to be superfluous.

config FOO
	tristate 'foo'
	depends on BAR || BAR=n

is not superfluous.  The allowed states for FOO with the above construct
are (assuming modules are enabled):

	BAR	FOO
	Y	Y,M,N
	M	M,N
	N	Y,M,N

Also, you create some constructs such as:

        depends on && PCI

which is obviously wrong.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

Re: [PATCH] Remove logically superfluous comparisons from Kconfig files.

[Robert P. J. Day]

On Mon, 18 Dec 2006, Russell King wrote:

> On Mon, Dec 18, 2006 at 05:14:01AM -0500, Robert P. J. Day wrote:
> >   Remove Kconfig comparisons of the form FUBAR || FUBAR=n, since they
> > appear to be superfluous.
>
> config FOO
> 	tristate 'foo'
> 	depends on BAR || BAR=n
>
> is not superfluous.  The allowed states for FOO with the above construct
> are (assuming modules are enabled):
>
> 	BAR	FOO
> 	Y	Y,M,N
> 	M	M,N
> 	N	Y,M,N

ah, ok, i get it now.

> Also, you create some constructs such as:
>
>         depends on && PCI
>
> which is obviously wrong.

whoops, sorry, i didn't even notice that.

rday

Re: [PATCH] Remove logically superfluous comparisons from Kconfig files.

[Horst H. von Brand]

Robert P. J. Day <rpjday@mindspring.com> wrote:
>   Remove Kconfig comparisons of the form FUBAR || FUBAR=n, since they
> appear to be superfluous.
> 
> Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
> 
> ---
> 
>   based on what i read in kconfig-language.txt, it would *appear* that
> those comparisons are redundant, but i'm willing to be convinced
> otherwise.  (unless the developer specifically wanted the case of
> "!=m", which i'm fairly sure is not the same thing, yes?)

Would be clearer written that way if so.

>  drivers/char/drm/Kconfig   |    2 +-
>  fs/dlm/Kconfig             |    1 -
>  net/ipv4/netfilter/Kconfig |    1 -
>  net/sctp/Kconfig           |    1 -
>  4 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
> index ef833a1..d681e68 100644
> --- a/drivers/char/drm/Kconfig
> +++ b/drivers/char/drm/Kconfig
> @@ -6,7 +6,7 @@
>  #
>  config DRM
>  	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
> -	depends on (AGP || AGP=n) && PCI
> +	depends on && PCI
                   ^^ ???

>  	help
-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                    Fono: +56 32 2654431
Universidad Tecnica Federico Santa Maria             +56 32 2654239
Casilla 110-V, Valparaiso, Chile               Fax:  +56 32 2797513

Re: [PATCH] Remove logically superfluous comparisons from Kconfig files.

[Robert P. J. Day]

On Wed, 27 Dec 2006, Horst H. von Brand wrote:

> Robert P. J. Day <rpjday@mindspring.com> wrote:
> >   Remove Kconfig comparisons of the form FUBAR || FUBAR=n, since they
> > appear to be superfluous.
> >
> > Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
> >
> > ---
> >
> >   based on what i read in kconfig-language.txt, it would *appear* that
> > those comparisons are redundant, but i'm willing to be convinced
> > otherwise.  (unless the developer specifically wanted the case of
> > "!=m", which i'm fairly sure is not the same thing, yes?)
>
> Would be clearer written that way if so.
>
> >  drivers/char/drm/Kconfig   |    2 +-
> >  fs/dlm/Kconfig             |    1 -
> >  net/ipv4/netfilter/Kconfig |    1 -
> >  net/sctp/Kconfig           |    1 -
> >  4 files changed, 1 insertion(+), 4 deletions(-)
> >
> > diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
> > index ef833a1..d681e68 100644
> > --- a/drivers/char/drm/Kconfig
> > +++ b/drivers/char/drm/Kconfig
> > @@ -6,7 +6,7 @@
> >  #
> >  config DRM
> >  	tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
> > -	depends on (AGP || AGP=n) && PCI
> > +	depends on && PCI
>                    ^^ ???

the stuff above is *very* old and also incorrect -- the only
outstanding patch i have in the queue should be to remove the final 3
"depends" directives in Kconfig files, nothing more.

rday