Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: Clean up headers

There is a few things done:
- include only the headers we are direct user of
- when pointer is in use, provide a forward declaration
- add missing headers
- group generic headers and subsystem headers
- sort each group alphabetically

While at it, fix some awkward indentations.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

+112 -63
+10 -9
drivers/pinctrl/core.c
··· 12 12 */ 13 13 #define pr_fmt(fmt) "pinctrl core: " fmt 14 14 15 - #include <linux/kernel.h> 16 - #include <linux/kref.h> 15 + #include <linux/debugfs.h> 16 + #include <linux/device.h> 17 + #include <linux/err.h> 17 18 #include <linux/export.h> 18 19 #include <linux/init.h> 19 - #include <linux/device.h> 20 - #include <linux/slab.h> 21 - #include <linux/err.h> 20 + #include <linux/kernel.h> 21 + #include <linux/kref.h> 22 22 #include <linux/list.h> 23 - #include <linux/debugfs.h> 24 23 #include <linux/seq_file.h> 24 + #include <linux/slab.h> 25 + 25 26 #include <linux/pinctrl/consumer.h> 26 - #include <linux/pinctrl/pinctrl.h> 27 + #include <linux/pinctrl/devinfo.h> 27 28 #include <linux/pinctrl/machine.h> 29 + #include <linux/pinctrl/pinctrl.h> 28 30 29 31 #ifdef CONFIG_GPIOLIB 30 32 #include "../gpio/gpiolib.h" ··· 35 33 36 34 #include "core.h" 37 35 #include "devicetree.h" 38 - #include "pinmux.h" 39 36 #include "pinconf.h" 40 - 37 + #include "pinmux.h" 41 38 42 39 static bool pinctrl_dummy_state; 43 40
+11 -1
drivers/pinctrl/core.h
··· 9 9 */ 10 10 11 11 #include <linux/kref.h> 12 + #include <linux/list.h> 12 13 #include <linux/mutex.h> 13 14 #include <linux/radix-tree.h> 14 - #include <linux/pinctrl/pinconf.h> 15 + #include <linux/types.h> 16 + 15 17 #include <linux/pinctrl/machine.h> 16 18 19 + struct dentry; 20 + struct device; 21 + struct device_node; 22 + struct module; 23 + 24 + struct pinctrl; 25 + struct pinctrl_desc; 17 26 struct pinctrl_gpio_range; 27 + struct pinctrl_state; 18 28 19 29 /** 20 30 * struct pinctrl_dev - pin control class device
+6
drivers/pinctrl/devicetree.h
··· 5 5 * Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved. 6 6 */ 7 7 8 + #include <linux/errno.h> 9 + 10 + struct device_node; 8 11 struct of_phandle_args; 12 + 13 + struct pinctrl; 14 + struct pinctrl_dev; 9 15 10 16 #ifdef CONFIG_OF 11 17
+10
drivers/pinctrl/pinconf.h
··· 10 10 * Author: Linus Walleij <linus.walleij@linaro.org> 11 11 */ 12 12 13 + #include <linux/errno.h> 14 + 15 + struct dentry; 16 + struct device_node; 17 + struct seq_file; 18 + 19 + struct pinctrl_dev; 20 + struct pinctrl_map; 21 + struct pinctrl_setting; 22 + 13 23 #ifdef CONFIG_PINCONF 14 24 15 25 int pinconf_check_ops(struct pinctrl_dev *pctldev);
+5
drivers/pinctrl/pinctrl-utils.h
··· 9 9 #ifndef __PINCTRL_UTILS_H__ 10 10 #define __PINCTRL_UTILS_H__ 11 11 12 + #include <linux/pinctrl/machine.h> 13 + 14 + struct pinctrl_dev; 15 + struct pinctrl_map; 16 + 12 17 int pinctrl_utils_reserve_map(struct pinctrl_dev *pctldev, 13 18 struct pinctrl_map **map, unsigned *reserved_maps, 14 19 unsigned *num_maps, unsigned reserve);
+12 -9
drivers/pinctrl/pinmux.c
··· 13 13 #define pr_fmt(fmt) "pinmux core: " fmt 14 14 15 15 #include <linux/ctype.h> 16 - #include <linux/kernel.h> 17 - #include <linux/module.h> 18 - #include <linux/init.h> 19 - #include <linux/device.h> 20 - #include <linux/slab.h> 21 - #include <linux/radix-tree.h> 22 - #include <linux/err.h> 23 - #include <linux/list.h> 24 - #include <linux/string.h> 25 16 #include <linux/debugfs.h> 17 + #include <linux/device.h> 18 + #include <linux/err.h> 19 + #include <linux/init.h> 20 + #include <linux/kernel.h> 21 + #include <linux/list.h> 22 + #include <linux/module.h> 23 + #include <linux/radix-tree.h> 26 24 #include <linux/seq_file.h> 25 + #include <linux/slab.h> 26 + #include <linux/string.h> 27 + 27 28 #include <linux/pinctrl/machine.h> 29 + #include <linux/pinctrl/pinctrl.h> 28 30 #include <linux/pinctrl/pinmux.h> 31 + 29 32 #include "core.h" 30 33 #include "pinmux.h" 31 34
+11
drivers/pinctrl/pinmux.h
··· 9 9 * 10 10 * Author: Linus Walleij <linus.walleij@linaro.org> 11 11 */ 12 + 13 + #include <linux/types.h> 14 + 15 + struct dentry; 16 + struct seq_file; 17 + 18 + struct pinctrl_dev; 19 + struct pinctrl_gpio_range; 20 + struct pinctrl_map; 21 + struct pinctrl_setting; 22 + 12 23 #ifdef CONFIG_PINMUX 13 24 14 25 int pinmux_check_ops(struct pinctrl_dev *pctldev);
+14 -17
include/linux/pinctrl/consumer.h
··· 12 12 #define __LINUX_PINCTRL_CONSUMER_H 13 13 14 14 #include <linux/err.h> 15 - #include <linux/list.h> 16 - #include <linux/seq_file.h> 15 + #include <linux/types.h> 16 + 17 17 #include <linux/pinctrl/pinctrl-state.h> 18 + 19 + struct device; 18 20 19 21 /* This struct is private to the core and should be regarded as a cookie */ 20 22 struct pinctrl; 21 23 struct pinctrl_state; 22 - struct device; 23 24 24 25 #ifdef CONFIG_PINCTRL 25 26 ··· 34 33 35 34 extern struct pinctrl * __must_check pinctrl_get(struct device *dev); 36 35 extern void pinctrl_put(struct pinctrl *p); 37 - extern struct pinctrl_state * __must_check pinctrl_lookup_state( 38 - struct pinctrl *p, 39 - const char *name); 36 + extern struct pinctrl_state * __must_check pinctrl_lookup_state(struct pinctrl *p, 37 + const char *name); 40 38 extern int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s); 41 39 42 40 extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev); ··· 101 101 { 102 102 } 103 103 104 - static inline struct pinctrl_state * __must_check pinctrl_lookup_state( 105 - struct pinctrl *p, 106 - const char *name) 104 + static inline struct pinctrl_state * __must_check pinctrl_lookup_state(struct pinctrl *p, 105 + const char *name) 107 106 { 108 107 return NULL; 109 108 } ··· 144 145 145 146 #endif /* CONFIG_PINCTRL */ 146 147 147 - static inline struct pinctrl * __must_check pinctrl_get_select( 148 - struct device *dev, const char *name) 148 + static inline struct pinctrl * __must_check pinctrl_get_select(struct device *dev, 149 + const char *name) 149 150 { 150 151 struct pinctrl *p; 151 152 struct pinctrl_state *s; ··· 170 171 return p; 171 172 } 172 173 173 - static inline struct pinctrl * __must_check pinctrl_get_select_default( 174 - struct device *dev) 174 + static inline struct pinctrl * __must_check pinctrl_get_select_default(struct device *dev) 175 175 { 176 176 return pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT); 177 177 } 178 178 179 - static inline struct pinctrl * __must_check devm_pinctrl_get_select( 180 - struct device *dev, const char *name) 179 + static inline struct pinctrl * __must_check devm_pinctrl_get_select(struct device *dev, 180 + const char *name) 181 181 { 182 182 struct pinctrl *p; 183 183 struct pinctrl_state *s; ··· 201 203 return p; 202 204 } 203 205 204 - static inline struct pinctrl * __must_check devm_pinctrl_get_select_default( 205 - struct device *dev) 206 + static inline struct pinctrl * __must_check devm_pinctrl_get_select_default(struct device *dev) 206 207 { 207 208 return devm_pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT); 208 209 }
+4 -2
include/linux/pinctrl/devinfo.h
··· 14 14 #ifndef PINCTRL_DEVINFO_H 15 15 #define PINCTRL_DEVINFO_H 16 16 17 + struct device; 18 + 17 19 #ifdef CONFIG_PINCTRL 18 20 19 21 /* The device core acts as a consumer toward pinctrl */ 20 22 #include <linux/pinctrl/consumer.h> 23 + 24 + struct pinctrl; 21 25 22 26 /** 23 27 * struct dev_pin_info - pin state container for devices ··· 45 41 extern int pinctrl_init_done(struct device *dev); 46 42 47 43 #else 48 - 49 - struct device; 50 44 51 45 /* Stubs if we're not using pinctrl */ 52 46
+5 -3
include/linux/pinctrl/machine.h
··· 11 11 #ifndef __LINUX_PINCTRL_MACHINE_H 12 12 #define __LINUX_PINCTRL_MACHINE_H 13 13 14 - #include <linux/bug.h> 14 + #include <linux/kernel.h> /* ARRAY_SIZE() */ 15 15 16 16 #include <linux/pinctrl/pinctrl-state.h> 17 17 ··· 149 149 #define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs) \ 150 150 PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs) 151 151 152 + struct pinctrl_map; 153 + 152 154 #ifdef CONFIG_PINCTRL 153 155 154 156 extern int pinctrl_register_mappings(const struct pinctrl_map *map, 155 - unsigned num_maps); 157 + unsigned num_maps); 156 158 extern void pinctrl_unregister_mappings(const struct pinctrl_map *map); 157 159 extern void pinctrl_provide_dummies(void); 158 160 #else 159 161 160 162 static inline int pinctrl_register_mappings(const struct pinctrl_map *map, 161 - unsigned num_maps) 163 + unsigned num_maps) 162 164 { 163 165 return 0; 164 166 }
+13 -10
include/linux/pinctrl/pinconf-generic.h
··· 11 11 #ifndef __LINUX_PINCTRL_PINCONF_GENERIC_H 12 12 #define __LINUX_PINCTRL_PINCONF_GENERIC_H 13 13 14 - #include <linux/device.h> 14 + #include <linux/types.h> 15 + 15 16 #include <linux/pinctrl/machine.h> 17 + 18 + struct device_node; 16 19 17 20 struct pinctrl_dev; 18 21 struct pinctrl_map; ··· 199 196 void pinconf_generic_dt_free_map(struct pinctrl_dev *pctldev, 200 197 struct pinctrl_map *map, unsigned num_maps); 201 198 202 - static inline int pinconf_generic_dt_node_to_map_group( 203 - struct pinctrl_dev *pctldev, struct device_node *np_config, 204 - struct pinctrl_map **map, unsigned *num_maps) 199 + static inline int pinconf_generic_dt_node_to_map_group(struct pinctrl_dev *pctldev, 200 + struct device_node *np_config, struct pinctrl_map **map, 201 + unsigned *num_maps) 205 202 { 206 203 return pinconf_generic_dt_node_to_map(pctldev, np_config, map, num_maps, 207 204 PIN_MAP_TYPE_CONFIGS_GROUP); 208 205 } 209 206 210 - static inline int pinconf_generic_dt_node_to_map_pin( 211 - struct pinctrl_dev *pctldev, struct device_node *np_config, 212 - struct pinctrl_map **map, unsigned *num_maps) 207 + static inline int pinconf_generic_dt_node_to_map_pin(struct pinctrl_dev *pctldev, 208 + struct device_node *np_config, struct pinctrl_map **map, 209 + unsigned *num_maps) 213 210 { 214 211 return pinconf_generic_dt_node_to_map(pctldev, np_config, map, num_maps, 215 212 PIN_MAP_TYPE_CONFIGS_PIN); 216 213 } 217 214 218 - static inline int pinconf_generic_dt_node_to_map_all( 219 - struct pinctrl_dev *pctldev, struct device_node *np_config, 220 - struct pinctrl_map **map, unsigned *num_maps) 215 + static inline int pinconf_generic_dt_node_to_map_all(struct pinctrl_dev *pctldev, 216 + struct device_node *np_config, struct pinctrl_map **map, 217 + unsigned *num_maps) 221 218 { 222 219 /* 223 220 * passing the type as PIN_MAP_TYPE_INVALID causes the underlying parser
+9 -9
include/linux/pinctrl/pinctrl.h
··· 11 11 #ifndef __LINUX_PINCTRL_PINCTRL_H 12 12 #define __LINUX_PINCTRL_PINCTRL_H 13 13 14 - #include <linux/radix-tree.h> 15 - #include <linux/list.h> 16 - #include <linux/seq_file.h> 17 - #include <linux/pinctrl/pinctrl-state.h> 18 - #include <linux/pinctrl/devinfo.h> 14 + #include <linux/types.h> 19 15 20 16 struct device; 17 + struct device_node; 18 + struct gpio_chip; 19 + struct module; 20 + struct seq_file; 21 + 22 + struct pin_config_item; 23 + struct pinconf_generic_params; 24 + struct pinconf_ops; 21 25 struct pinctrl_dev; 22 26 struct pinctrl_map; 23 27 struct pinmux_ops; 24 - struct pinconf_ops; 25 - struct pin_config_item; 26 - struct gpio_chip; 27 - struct device_node; 28 28 29 29 /** 30 30 * struct pingroup - provides information on pingroup
+2 -3
include/linux/pinctrl/pinmux.h
··· 11 11 #ifndef __LINUX_PINCTRL_PINMUX_H 12 12 #define __LINUX_PINCTRL_PINMUX_H 13 13 14 - #include <linux/list.h> 15 - #include <linux/seq_file.h> 16 - #include <linux/pinctrl/pinctrl.h> 14 + #include <linux/types.h> 17 15 18 16 struct pinctrl_dev; 17 + struct pinctrl_gpio_range; 19 18 20 19 /** 21 20 * struct pinmux_ops - pinmux operations, to be implemented by pin controller