FROMLIST: extcon: Add the support for the capability of each property

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinconf.h

diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index a4a5417e1413d738b1151865a1b70d8b5fdb2957..55c75780b3b29e2dbefcefba6c9ff5556e70f21c 100644 (file)
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -92,26 +92,17 @@ static inline void pinconf_init_device_debugfs(struct dentry *devroot,
 
 #if defined(CONFIG_GENERIC_PINCONF) && defined(CONFIG_DEBUG_FS)
 
-void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev,
-                             struct seq_file *s, unsigned pin);
-
-void pinconf_generic_dump_group(struct pinctrl_dev *pctldev,
-                             struct seq_file *s, const char *gname);
+void pinconf_generic_dump_pins(struct pinctrl_dev *pctldev,
+                              struct seq_file *s, const char *gname,
+                              unsigned pin);
 
 void pinconf_generic_dump_config(struct pinctrl_dev *pctldev,
                                 struct seq_file *s, unsigned long config);
 #else
 
-static inline void pinconf_generic_dump_pin(struct pinctrl_dev *pctldev,
-                                           struct seq_file *s,
-                                           unsigned pin)
-{
-       return;
-}
-
-static inline void pinconf_generic_dump_group(struct pinctrl_dev *pctldev,
-                                             struct seq_file *s,
-                                             const char *gname)
+static inline void pinconf_generic_dump_pins(struct pinctrl_dev *pctldev,
+                                            struct seq_file *s,
+                                            const char *gname, unsigned pin)
 {
        return;
 }
@@ -126,6 +117,7 @@ static inline void pinconf_generic_dump_config(struct pinctrl_dev *pctldev,
 
 #if defined(CONFIG_GENERIC_PINCONF) && defined(CONFIG_OF)
 int pinconf_generic_parse_dt_config(struct device_node *np,
+                                   struct pinctrl_dev *pctldev,
                                    unsigned long **configs,
                                    unsigned int *nconfigs);
 #endif