From: Lee Jones <lee.jones@linaro.org>
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 <lee.jones@linaro.org>
Subject: [PATCH v2 1/2] [media] rc-core: Add inlined stubs for core rc_* functions
Date: Wed, 12 Apr 2017 16:39:55 +0100 [thread overview]
Message-ID: <20170412153956.13329-1-lee.jones@linaro.org> (raw)
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 <lee.jones@linaro.org>
---
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(+)
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
--
2.9.3
next reply other threads:[~2017-04-12 15:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 15:39 Lee Jones [this message]
2017-04-12 15:39 ` [PATCH v2 2/2] [media] cec: Handle RC capability more elegantly Lee Jones
2017-04-28 10:37 ` [PATCH v2 1/2] [media] rc-core: Add inlined stubs for core rc_* functions Lee Jones
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=20170412153956.13329-1-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=hans.verkuil@cisco.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mchehab@kernel.org \
--cc=patrice.chotard@st.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).