From patchwork Wed Apr 12 15:39:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 97299 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp326224qgf; Wed, 12 Apr 2017 08:40:32 -0700 (PDT) X-Received: by 10.98.74.135 with SMTP id c7mr16923944pfj.140.1492011632857; Wed, 12 Apr 2017 08:40:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t5si20779560pgb.329.2017.04.12.08.40.32; Wed, 12 Apr 2017 08:40:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754410AbdDLPkH (ORCPT + 17 others); Wed, 12 Apr 2017 11:40:07 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35332 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752513AbdDLPkD (ORCPT ); Wed, 12 Apr 2017 11:40:03 -0400 Received: by mail-wm0-f41.google.com with SMTP id w64so91249839wma.0 for ; Wed, 12 Apr 2017 08:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=zP/FCmfAPEjGvhxKfCM/diDVPdlmpLtz1x4mGXEdsTs=; b=ZiUdxMtmh/Vb7VgtoGOVTvhJPHtx/2lP29HXj+8NduOa9XX8LMwevBpoKFCqXK6foy 6MBQDX6LsuSquczLepIvptPWhXvJIB4Cxs+hoW02E4Zugkfr5eO+KmKjnu1tc2JjIQ0v dRPKiR+eZEbBcAbx2iW+iYM1kD7PmOlapQp/A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zP/FCmfAPEjGvhxKfCM/diDVPdlmpLtz1x4mGXEdsTs=; b=FqLU1EnMnot7j5KOVHD/9LI35e9NvRcigsnKOzTGOsP1KRaLv9XeExjML4T3THyQEk /jzVAvgS3WmjHyt52PyuiRjIF0vKRoN5krjDVLU8JDMKVD4Q+b+uhVQ+bRVg4DHNgowu Z3a0d+WaRI+5z751D0F+Y0WXMebR/YajVR9TmbQw+8h/JQ2vnPZR0oXdwaHkUg3Gd2w9 CEduSRO2FF4LnWCowqyPR3h3+LRcUCAcK10ckjbsismPxKph1UHxoBJacGgUAyYAdiQU 7NUjapeSNxjQTZNopRb60BAYp1Y3JwX2NU4z3b8aXRVLqwG32gyQrX+7+V392iX+WCbZ EunQ== X-Gm-Message-State: AN3rC/4A80zlCcxYKfHfvTpp3b5PkMBRoGqF53eQ0yfs3OocTrdqWAno 11J0a3SWIL2IYKS5 X-Received: by 10.28.146.207 with SMTP id u198mr20143556wmd.103.1492011601615; Wed, 12 Apr 2017 08:40:01 -0700 (PDT) Received: from localhost.localdomain ([2.31.167.174]) by smtp.gmail.com with ESMTPSA id c8sm26055904wrd.57.2017.04.12.08.40.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 08:40:00 -0700 (PDT) From: Lee Jones To: hans.verkuil@cisco.com, mchehab@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, patrice.chotard@st.com, linux@armlinux.org.uk, Lee Jones Subject: [PATCH v2 1/2] [media] rc-core: Add inlined stubs for core rc_* functions Date: Wed, 12 Apr 2017 16:39:55 +0100 Message-Id: <20170412153956.13329-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently users have to use all sorts of ugly #ifery within their drivers in order to avoid linking issues at build time. This patch allows users to safely call these functions when !CONFIG_RC_CORE and make decisions based on the return value instead. This is a much more common and clean way of doing things within the Linux kernel. Signed-off-by: Lee Jones --- v1 => v2 - Use '#if IF_ENABLED()' instead of '#ifdef' in order to do the right thing, even when CONFIG_RC_CORE=m. include/media/rc-core.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) -- 2.9.3 diff --git a/include/media/rc-core.h b/include/media/rc-core.h index 73ddd721..f176a9e 100644 --- a/include/media/rc-core.h +++ b/include/media/rc-core.h @@ -209,7 +209,14 @@ struct rc_dev { * @rc_driver_type: specifies the type of the RC output to be allocated * returns a pointer to struct rc_dev. */ +#if IS_ENABLED(CONFIG_RC_CORE) struct rc_dev *rc_allocate_device(enum rc_driver_type); +#else +static inline struct rc_dev *rc_allocate_device(int unused) +{ + return NULL; +} +#endif /** * devm_rc_allocate_device - Managed RC device allocation @@ -218,21 +225,42 @@ struct rc_dev *rc_allocate_device(enum rc_driver_type); * @rc_driver_type: specifies the type of the RC output to be allocated * returns a pointer to struct rc_dev. */ +#if IS_ENABLED(CONFIG_RC_CORE) struct rc_dev *devm_rc_allocate_device(struct device *dev, enum rc_driver_type); +#else +static inline struct rc_dev *devm_rc_allocate_device(struct device *dev, int unused) +{ + return NULL; +} +#endif /** * rc_free_device - Frees a RC device * * @dev: pointer to struct rc_dev. */ +#if IS_ENABLED(CONFIG_RC_CORE) void rc_free_device(struct rc_dev *dev); +#else +static inline void rc_free_device(struct rc_dev *dev) +{ + return; +} +#endif /** * rc_register_device - Registers a RC device * * @dev: pointer to struct rc_dev. */ +#if IS_ENABLED(CONFIG_RC_CORE) int rc_register_device(struct rc_dev *dev); +#else +static inline int rc_register_device(struct rc_dev *dev) +{ + return -EOPNOTSUPP; +} +#endif /** * devm_rc_register_device - Manageded registering of a RC device @@ -240,14 +268,28 @@ int rc_register_device(struct rc_dev *dev); * @parent: pointer to struct device. * @dev: pointer to struct rc_dev. */ +#if IS_ENABLED(CONFIG_RC_CORE) int devm_rc_register_device(struct device *parent, struct rc_dev *dev); +#else +static inline int devm_rc_register_device(struct device *parent, struct rc_dev *dev) +{ + return -EOPNOTSUPP; +} +#endif /** * rc_unregister_device - Unregisters a RC device * * @dev: pointer to struct rc_dev. */ +#if IS_ENABLED(CONFIG_RC_CORE) void rc_unregister_device(struct rc_dev *dev); +#else +static inline void rc_unregister_device(struct rc_dev *dev) +{ + return; +} +#endif /** * rc_open - Opens a RC device