linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Javier Martinez Canillas <javier@osg.samsung.com>,
	linux-kernel@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org,
	Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Subject: Re: [PATCH] fbdev: Use IS_ENABLED() instead of checking for built-in or module
Date: Fri, 13 May 2016 12:15:14 +0000	[thread overview]
Message-ID: <5735C552.1000508@ti.com> (raw)
In-Reply-To: <1462982363-25389-1-git-send-email-javier@osg.samsung.com>


[-- Attachment #1.1: Type: text/plain, Size: 2112 bytes --]

On 11/05/16 18:59, Javier Martinez Canillas wrote:
> The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
> built-in or as a module, use that macro instead of open coding the same.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
>  drivers/video/fbdev/via/accel.c    | 2 +-
>  drivers/video/fbdev/via/via-core.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/video/fbdev/via/accel.c b/drivers/video/fbdev/via/accel.c
> index 4b67b8e6030a..eb3615c69987 100644
> --- a/drivers/video/fbdev/via/accel.c
> +++ b/drivers/video/fbdev/via/accel.c
> @@ -358,7 +358,7 @@ int viafb_setup_engine(struct fb_info *info)
>  	viapar->shared->vq_vram_addr = viapar->fbmem_free;
>  	viapar->fbmem_used += VQ_SIZE;
>  
> -#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
> +#if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA)
>  	/*
>  	 * Set aside a chunk of framebuffer memory for the camera
>  	 * driver.  Someday this driver probably needs a proper allocator
> diff --git a/drivers/video/fbdev/via/via-core.c b/drivers/video/fbdev/via/via-core.c
> index 6e274825fb31..1d28e16888e9 100644
> --- a/drivers/video/fbdev/via/via-core.c
> +++ b/drivers/video/fbdev/via/via-core.c
> @@ -116,7 +116,7 @@ EXPORT_SYMBOL_GPL(viafb_irq_disable);
>   * most viafb systems will not need to have this extra code for a while.
>   * As soon as another user comes long, the ifdef can be removed.
>   */
> -#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
> +#if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA)
>  /*
>   * Access to the DMA engine.  This currently provides what the camera
>   * driver needs (i.e. outgoing only) but is easily expandable if need
> @@ -542,7 +542,7 @@ static struct viafb_subdev_info {
>  	{
>  		.name = "viafb-i2c",
>  	},
> -#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
> +#if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA)
>  	{
>  		.name = "viafb-camera",
>  	},
> 

Thanks, queued for 4.7.

 Tomi


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

      reply	other threads:[~2016-05-13 12:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-11 15:59 [PATCH] fbdev: Use IS_ENABLED() instead of checking for built-in or module Javier Martinez Canillas
2016-05-13 12:15 ` Tomi Valkeinen [this message]

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=5735C552.1000508@ti.com \
    --to=tomi.valkeinen@ti.com \
    --cc=FlorianSchandinat@gmx.de \
    --cc=javier@osg.samsung.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=plagnioj@jcrosoft.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).