diff options
author | David Brown <davidb@codeaurora.org> | 2011-05-16 13:32:15 -0700 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2011-08-01 04:58:00 -0700 |
commit | 030a77fc9b805a38a2ffaea42728557282b81275 (patch) | |
tree | cfa523bf81db0c49e88c7ef4b5fef3c50d775b8d /arch/arm/mach-msm/gpiomux.h | |
parent | 10eb5f6bcbdc5e460e5500e1dbc39b2e7713ebfd (diff) | |
download | op-kernel-dev-030a77fc9b805a38a2ffaea42728557282b81275.zip op-kernel-dev-030a77fc9b805a38a2ffaea42728557282b81275.tar.gz |
msm: gpiomux: Move public API to public header
The gpiomux.h header contains some SOC ifdefs. However, the API that
is actually used by the GPIO driver only uses two functions that are
general. Move these general definitions into a public header file.
Change-Id: Ia5df8af87dba268225598d56908e523bcfc24ef6
Signed-off-by: David Brown <davidb@codeaurora.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm/mach-msm/gpiomux.h')
-rw-r--r-- | arch/arm/mach-msm/gpiomux.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-msm/gpiomux.h b/arch/arm/mach-msm/gpiomux.h index b178d9c..00459f6 100644 --- a/arch/arm/mach-msm/gpiomux.h +++ b/arch/arm/mach-msm/gpiomux.h @@ -19,6 +19,7 @@ #include <linux/bitops.h> #include <linux/errno.h> +#include <mach/msm_gpiomux.h> #if defined(CONFIG_MSM_V2_TLMM) #include "gpiomux-v2.h" @@ -71,12 +72,6 @@ enum { */ extern struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS]; -/* Increment a gpio's reference count, possibly activating the line. */ -int __must_check msm_gpiomux_get(unsigned gpio); - -/* Decrement a gpio's reference count, possibly suspending the line. */ -int msm_gpiomux_put(unsigned gpio); - /* Install a new configuration to the gpio line. To avoid overwriting * a configuration, leave the VALID bit out. */ @@ -94,16 +89,6 @@ int msm_gpiomux_write(unsigned gpio, */ void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val); #else -static inline int __must_check msm_gpiomux_get(unsigned gpio) -{ - return -ENOSYS; -} - -static inline int msm_gpiomux_put(unsigned gpio) -{ - return -ENOSYS; -} - static inline int msm_gpiomux_write(unsigned gpio, gpiomux_config_t active, gpiomux_config_t suspended) |