All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Paul Bolle <pebolle@tiscali.nl>
Cc: Russell King <linux@arm.linux.org.uk>,
	linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: OMAP: fix typo "CONFIG_SMC91x_MODULE"
Date: Wed, 20 Mar 2013 09:30:43 -0700	[thread overview]
Message-ID: <20130320163043.GM16413@atomide.com> (raw)
In-Reply-To: <1362744397.5994.58.camel@x61.thuisdomein>

* Paul Bolle <pebolle@tiscali.nl> [130308 04:10]:
> There's a (rather subtle) typo in "CONFIG_SMC91x_MODULE". Fix it once
> and for all by using IS_ENABLED(), which is designed to avoid issues
> like this.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested! And this needs build- and runtime testing, especially for the
> MODULE case!

Thanks looks good to me. Since this is for legacy platforms and been
broken for quite a while, I'll apply it into omap-for-v3.10/fixes-non-critical.

Regards,

Tony
 
>  arch/arm/mach-omap2/board-2430sdp.c | 2 +-
>  arch/arm/mach-omap2/board-h4.c      | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
> index a3e0aaa..cb0596b 100644
> --- a/arch/arm/mach-omap2/board-2430sdp.c
> +++ b/arch/arm/mach-omap2/board-2430sdp.c
> @@ -166,7 +166,7 @@ static void __init sdp2430_display_init(void)
>  	omap_display_init(&sdp2430_dss_data);
>  }
>  
> -#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
> +#if IS_ENABLED(CONFIG_SMC91X)
>  
>  static struct omap_smc91x_platform_data board_smc91x_data = {
>  	.cs		= 5,
> diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
> index 812c829..5b4ec51 100644
> --- a/arch/arm/mach-omap2/board-h4.c
> +++ b/arch/arm/mach-omap2/board-h4.c
> @@ -246,7 +246,7 @@ static u32 is_gpmc_muxed(void)
>  		return 0;
>  }
>  
> -#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
> +#if IS_ENABLED(CONFIG_SMC91X)
>  
>  static struct omap_smc91x_platform_data board_smc91x_data = {
>  	.cs		= 1,
> -- 
> 1.7.11.7
> 

WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP: fix typo "CONFIG_SMC91x_MODULE"
Date: Wed, 20 Mar 2013 09:30:43 -0700	[thread overview]
Message-ID: <20130320163043.GM16413@atomide.com> (raw)
In-Reply-To: <1362744397.5994.58.camel@x61.thuisdomein>

* Paul Bolle <pebolle@tiscali.nl> [130308 04:10]:
> There's a (rather subtle) typo in "CONFIG_SMC91x_MODULE". Fix it once
> and for all by using IS_ENABLED(), which is designed to avoid issues
> like this.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested! And this needs build- and runtime testing, especially for the
> MODULE case!

Thanks looks good to me. Since this is for legacy platforms and been
broken for quite a while, I'll apply it into omap-for-v3.10/fixes-non-critical.

Regards,

Tony
 
>  arch/arm/mach-omap2/board-2430sdp.c | 2 +-
>  arch/arm/mach-omap2/board-h4.c      | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
> index a3e0aaa..cb0596b 100644
> --- a/arch/arm/mach-omap2/board-2430sdp.c
> +++ b/arch/arm/mach-omap2/board-2430sdp.c
> @@ -166,7 +166,7 @@ static void __init sdp2430_display_init(void)
>  	omap_display_init(&sdp2430_dss_data);
>  }
>  
> -#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
> +#if IS_ENABLED(CONFIG_SMC91X)
>  
>  static struct omap_smc91x_platform_data board_smc91x_data = {
>  	.cs		= 5,
> diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
> index 812c829..5b4ec51 100644
> --- a/arch/arm/mach-omap2/board-h4.c
> +++ b/arch/arm/mach-omap2/board-h4.c
> @@ -246,7 +246,7 @@ static u32 is_gpmc_muxed(void)
>  		return 0;
>  }
>  
> -#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
> +#if IS_ENABLED(CONFIG_SMC91X)
>  
>  static struct omap_smc91x_platform_data board_smc91x_data = {
>  	.cs		= 1,
> -- 
> 1.7.11.7
> 

  reply	other threads:[~2013-03-20 16:30 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-08 12:06 [PATCH] ARM: OMAP: fix typo "CONFIG_SMC91x_MODULE" Paul Bolle
2013-03-08 12:06 ` Paul Bolle
2013-03-20 16:30 ` Tony Lindgren [this message]
2013-03-20 16:30   ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130320163043.GM16413@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=pebolle@tiscali.nl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.