[PATCH 1/2] [media] cec: Move capability check inside #if

From	Lee Jones <lee.jones@linaro.org>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] [media] cec: Move capability check inside #if
Date	2017-04-04 14:40 +0200
Message-ID	<tsvUC-4Rz-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

If CONFIG_RC_CORE is not enabled then none of the RC code will be
executed anyway, so we're placing the capability check inside the

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/media/cec/cec-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c
index 37217e2..06a312c 100644
--- a/drivers/media/cec/cec-core.c
+++ b/drivers/media/cec/cec-core.c
@@ -234,10 +234,10 @@ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
 		return ERR_PTR(res);
 	}
 
+#if IS_REACHABLE(CONFIG_RC_CORE)
 	if (!(caps & CEC_CAP_RC))
 		return adap;
 
-#if IS_REACHABLE(CONFIG_RC_CORE)
 	/* Prepare the RC input device */
 	adap->rc = rc_allocate_device(RC_DRIVER_SCANCODE);
 	if (!adap->rc) {
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/2] [media] cec: Move capability check inside #if Lee Jones <lee.jones@linaro.org> - 2017-04-04 14:40 +0200
  Re: [PATCH 1/2] [media] cec: Move capability check inside #if Hans Verkuil <hverkuil@xs4all.nl> - 2017-04-04 14:40 +0200
    Re: [PATCH 1/2] [media] cec: Move capability check inside #if Hans Verkuil <hverkuil@xs4all.nl> - 2017-04-04 15:00 +0200
    Re: [PATCH 1/2] [media] cec: Move capability check inside #if Lee Jones <lee.jones@linaro.org> - 2017-04-04 15:00 +0200
      Re: [PATCH 1/2] [media] cec: Move capability check inside #if Lee Jones <lee.jones@linaro.org> - 2017-04-04 15:10 +0200
        Re: [PATCH 1/2] [media] cec: Move capability check inside #if Hans Verkuil <hverkuil@xs4all.nl> - 2017-04-04 15:20 +0200
          Re: [PATCH 1/2] [media] cec: Move capability check inside #if Lee Jones <lee.jones@linaro.org> - 2017-04-04 15:40 +0200

csiph-web