diff options
author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-05-11 11:59:23 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2016-05-13 08:14:38 -0400 |
commit | ab366b40b8513e7590858229ecbb5e1434a52b54 (patch) | |
tree | bc666fd9081b83962e35676c99024a98a0aca74c | |
parent | a53dd258279c1e8bff205e3273a285bdd4b87406 (diff) |
fbdev: Use IS_ENABLED() instead of checking for built-in or module
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>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/fbdev/via/accel.c | 2 | ||||
-rw-r--r-- | 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) | |||
358 | viapar->shared->vq_vram_addr = viapar->fbmem_free; | 358 | viapar->shared->vq_vram_addr = viapar->fbmem_free; |
359 | viapar->fbmem_used += VQ_SIZE; | 359 | viapar->fbmem_used += VQ_SIZE; |
360 | 360 | ||
361 | #if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE) | 361 | #if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA) |
362 | /* | 362 | /* |
363 | * Set aside a chunk of framebuffer memory for the camera | 363 | * Set aside a chunk of framebuffer memory for the camera |
364 | * driver. Someday this driver probably needs a proper allocator | 364 | * 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); | |||
116 | * most viafb systems will not need to have this extra code for a while. | 116 | * most viafb systems will not need to have this extra code for a while. |
117 | * As soon as another user comes long, the ifdef can be removed. | 117 | * As soon as another user comes long, the ifdef can be removed. |
118 | */ | 118 | */ |
119 | #if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE) | 119 | #if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA) |
120 | /* | 120 | /* |
121 | * Access to the DMA engine. This currently provides what the camera | 121 | * Access to the DMA engine. This currently provides what the camera |
122 | * driver needs (i.e. outgoing only) but is easily expandable if need | 122 | * driver needs (i.e. outgoing only) but is easily expandable if need |
@@ -542,7 +542,7 @@ static struct viafb_subdev_info { | |||
542 | { | 542 | { |
543 | .name = "viafb-i2c", | 543 | .name = "viafb-i2c", |
544 | }, | 544 | }, |
545 | #if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE) | 545 | #if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA) |
546 | { | 546 | { |
547 | .name = "viafb-camera", | 547 | .name = "viafb-camera", |
548 | }, | 548 | }, |