diff options
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 b178d9cb742..00459f6ee13 100644 --- a/arch/arm/mach-msm/gpiomux.h +++ b/arch/arm/mach-msm/gpiomux.h | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include <linux/bitops.h> | 20 | #include <linux/bitops.h> |
21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
22 | #include <mach/msm_gpiomux.h> | ||
22 | 23 | ||
23 | #if defined(CONFIG_MSM_V2_TLMM) | 24 | #if defined(CONFIG_MSM_V2_TLMM) |
24 | #include "gpiomux-v2.h" | 25 | #include "gpiomux-v2.h" |
@@ -71,12 +72,6 @@ enum { | |||
71 | */ | 72 | */ |
72 | extern struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS]; | 73 | extern struct msm_gpiomux_config msm_gpiomux_configs[GPIOMUX_NGPIOS]; |
73 | 74 | ||
74 | /* Increment a gpio's reference count, possibly activating the line. */ | ||
75 | int __must_check msm_gpiomux_get(unsigned gpio); | ||
76 | |||
77 | /* Decrement a gpio's reference count, possibly suspending the line. */ | ||
78 | int msm_gpiomux_put(unsigned gpio); | ||
79 | |||
80 | /* Install a new configuration to the gpio line. To avoid overwriting | 75 | /* Install a new configuration to the gpio line. To avoid overwriting |
81 | * a configuration, leave the VALID bit out. | 76 | * a configuration, leave the VALID bit out. |
82 | */ | 77 | */ |
@@ -94,16 +89,6 @@ int msm_gpiomux_write(unsigned gpio, | |||
94 | */ | 89 | */ |
95 | void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val); | 90 | void __msm_gpiomux_write(unsigned gpio, gpiomux_config_t val); |
96 | #else | 91 | #else |
97 | static inline int __must_check msm_gpiomux_get(unsigned gpio) | ||
98 | { | ||
99 | return -ENOSYS; | ||
100 | } | ||
101 | |||
102 | static inline int msm_gpiomux_put(unsigned gpio) | ||
103 | { | ||
104 | return -ENOSYS; | ||
105 | } | ||
106 | |||
107 | static inline int msm_gpiomux_write(unsigned gpio, | 92 | static inline int msm_gpiomux_write(unsigned gpio, |
108 | gpiomux_config_t active, | 93 | gpiomux_config_t active, |
109 | gpiomux_config_t suspended) | 94 | gpiomux_config_t suspended) |