[media] cec: fix confusing CEC_CAP_RC and IS_REACHABLE(CONFIG_RC_CORE) code (ee044f5b) · Commits · 戴 / test

It is a bit confusing how CEC_CAP_RC and IS_REACHABLE(CONFIG_RC_CORE) interact. By stripping CEC_CAP_RC at the beginning rather than after #else it should be a bit clearer what is going on. Signed-off-by:

Hans Verkuil <hans.verkuil@cisco.com> Reported-by:

Lee Jones <lee.jones@linaro.org> Signed-off-by:

Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by:

Mauro Carvalho Chehab <mchehab@s-opensource.com>

drivers/media/cec/cec-core.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -220,6 +220,10 @@ struct cec_adapter cec_allocate_adapter(const struct cec_adap_ops ops,
		struct cec_adapter *adap;
		int res;

		#if !IS_REACHABLE(CONFIG_RC_CORE)
		caps &= ~CEC_CAP_RC;
		#endif

		if (WARN_ON(!caps))
		return ERR_PTR(-EINVAL);
		if (WARN_ON(!ops))
		@@ -252,10 +256,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) {
		@@ -282,8 +286,6 @@ struct cec_adapter cec_allocate_adapter(const struct cec_adap_ops ops,
		adap->rc->priv = adap;
		adap->rc->map_name = RC_MAP_CEC;
		adap->rc->timeout = MS_TO_NS(100);
		#else
		adap->capabilities &= ~CEC_CAP_RC;
		#endif
		return adap;
		}

Admin message