diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-04-11 18:45:45 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-04-18 07:53:12 -0400 |
commit | c736d73c9e6d9849ecb08c34c1d3917b210e8f38 (patch) | |
tree | 245a0179276b9217258ae848a8e777f53473a5f5 | |
parent | 630e2d0494f001cc3c435cac374f92e4bde0f518 (diff) |
pinctrl: ifdef CONFIG_DEBUG_FS cleanup
Only provide prototypes for pin{mux,conf}.c debugfs-related functions
when both CONFIG_PIN* /and/ CONFIG_DEBUG_FS are enabled, otherwise
provide static inlines.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/pinconf.h | 17 | ||||
-rw-r--r-- | drivers/pinctrl/pinmux.h | 18 |
2 files changed, 24 insertions, 11 deletions
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h index 54510de5e8c6..32b8354d2510 100644 --- a/drivers/pinctrl/pinconf.h +++ b/drivers/pinctrl/pinconf.h | |||
@@ -19,11 +19,6 @@ int pinconf_map_to_setting(struct pinctrl_map const *map, | |||
19 | struct pinctrl_setting *setting); | 19 | struct pinctrl_setting *setting); |
20 | void pinconf_free_setting(struct pinctrl_setting const *setting); | 20 | void pinconf_free_setting(struct pinctrl_setting const *setting); |
21 | int pinconf_apply_setting(struct pinctrl_setting const *setting); | 21 | int pinconf_apply_setting(struct pinctrl_setting const *setting); |
22 | void pinconf_show_map(struct seq_file *s, struct pinctrl_map const *map); | ||
23 | void pinconf_show_setting(struct seq_file *s, | ||
24 | struct pinctrl_setting const *setting); | ||
25 | void pinconf_init_device_debugfs(struct dentry *devroot, | ||
26 | struct pinctrl_dev *pctldev); | ||
27 | 22 | ||
28 | /* | 23 | /* |
29 | * You will only be interested in these if you're using PINCONF | 24 | * You will only be interested in these if you're using PINCONF |
@@ -61,6 +56,18 @@ static inline int pinconf_apply_setting(struct pinctrl_setting const *setting) | |||
61 | return 0; | 56 | return 0; |
62 | } | 57 | } |
63 | 58 | ||
59 | #endif | ||
60 | |||
61 | #if defined(CONFIG_PINMUX) && defined(CONFIG_DEBUG_FS) | ||
62 | |||
63 | void pinconf_show_map(struct seq_file *s, struct pinctrl_map const *map); | ||
64 | void pinconf_show_setting(struct seq_file *s, | ||
65 | struct pinctrl_setting const *setting); | ||
66 | void pinconf_init_device_debugfs(struct dentry *devroot, | ||
67 | struct pinctrl_dev *pctldev); | ||
68 | |||
69 | #else | ||
70 | |||
64 | static inline void pinconf_show_map(struct seq_file *s, | 71 | static inline void pinconf_show_map(struct seq_file *s, |
65 | struct pinctrl_map const *map) | 72 | struct pinctrl_map const *map) |
66 | { | 73 | { |
diff --git a/drivers/pinctrl/pinmux.h b/drivers/pinctrl/pinmux.h index 6fc47003e95d..d1a98b1c9fce 100644 --- a/drivers/pinctrl/pinmux.h +++ b/drivers/pinctrl/pinmux.h | |||
@@ -31,12 +31,6 @@ void pinmux_free_setting(struct pinctrl_setting const *setting); | |||
31 | int pinmux_enable_setting(struct pinctrl_setting const *setting); | 31 | int pinmux_enable_setting(struct pinctrl_setting const *setting); |
32 | void pinmux_disable_setting(struct pinctrl_setting const *setting); | 32 | void pinmux_disable_setting(struct pinctrl_setting const *setting); |
33 | 33 | ||
34 | void pinmux_show_map(struct seq_file *s, struct pinctrl_map const *map); | ||
35 | void pinmux_show_setting(struct seq_file *s, | ||
36 | struct pinctrl_setting const *setting); | ||
37 | void pinmux_init_device_debugfs(struct dentry *devroot, | ||
38 | struct pinctrl_dev *pctldev); | ||
39 | |||
40 | #else | 34 | #else |
41 | 35 | ||
42 | static inline int pinmux_check_ops(struct pinctrl_dev *pctldev) | 36 | static inline int pinmux_check_ops(struct pinctrl_dev *pctldev) |
@@ -89,6 +83,18 @@ static inline void pinmux_disable_setting( | |||
89 | { | 83 | { |
90 | } | 84 | } |
91 | 85 | ||
86 | #endif | ||
87 | |||
88 | #if defined(CONFIG_PINMUX) && defined(CONFIG_DEBUG_FS) | ||
89 | |||
90 | void pinmux_show_map(struct seq_file *s, struct pinctrl_map const *map); | ||
91 | void pinmux_show_setting(struct seq_file *s, | ||
92 | struct pinctrl_setting const *setting); | ||
93 | void pinmux_init_device_debugfs(struct dentry *devroot, | ||
94 | struct pinctrl_dev *pctldev); | ||
95 | |||
96 | #else | ||
97 | |||
92 | static inline void pinmux_show_map(struct seq_file *s, | 98 | static inline void pinmux_show_map(struct seq_file *s, |
93 | struct pinctrl_map const *map) | 99 | struct pinctrl_map const *map) |
94 | { | 100 | { |