Skip to content

Commit e5530ad

Browse files
andy-shevandy-shev
committed
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 <[email protected]>
1 parent de23ccb commit e5530ad

File tree

13 files changed

+110
-61
lines changed

13 files changed

+110
-61
lines changed

‎drivers/pinctrl/core.c‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@
1212
*/
1313
#define pr_fmt(fmt) "pinctrl core: " fmt
1414

15-
#include <linux/kernel.h>
16-
#include <linux/kref.h>
17-
#include <linux/export.h>
18-
#include <linux/init.h>
15+
#include <linux/debugfs.h>
1916
#include <linux/device.h>
20-
#include <linux/slab.h>
2117
#include <linux/err.h>
18+
#include <linux/export.h>
19+
#include <linux/init.h>
20+
#include <linux/kernel.h>
21+
#include <linux/kref.h>
2222
#include <linux/list.h>
23-
#include <linux/debugfs.h>
2423
#include <linux/seq_file.h>
24+
#include <linux/slab.h>
25+
2526
#include <linux/pinctrl/consumer.h>
26-
#include <linux/pinctrl/pinctrl.h>
27+
#include <linux/pinctrl/devinfo.h>
2728
#include <linux/pinctrl/machine.h>
29+
#include <linux/pinctrl/pinctrl.h>
2830

2931
#ifdef CONFIG_GPIOLIB
3032
#include "../gpio/gpiolib.h"
@@ -33,9 +35,8 @@
3335

3436
#include "core.h"
3537
#include "devicetree.h"
36-
#include "pinmux.h"
3738
#include "pinconf.h"
38-
39+
#include "pinmux.h"
3940

4041
static bool pinctrl_dummy_state;
4142

‎drivers/pinctrl/core.h‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,22 @@
99
*/
1010

1111
#include <linux/kref.h>
12+
#include <linux/list.h>
1213
#include <linux/mutex.h>
1314
#include <linux/radix-tree.h>
14-
#include <linux/pinctrl/pinconf.h>
15+
#include <linux/types.h>
16+
1517
#include <linux/pinctrl/machine.h>
1618

19+
struct dentry;
20+
struct device;
21+
struct device_node;
22+
struct module;
23+
24+
struct pinctrl;
25+
struct pinctrl_desc;
1726
struct pinctrl_gpio_range;
27+
struct pinctrl_state;
1828

1929
/**
2030
* struct pinctrl_dev - pin control class device

‎drivers/pinctrl/devicetree.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
* Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved.
66
*/
77

8+
#include <linux/errno.h>
9+
10+
struct device_node;
811
struct of_phandle_args;
912

13+
struct pinctrl;
14+
struct pinctrl_dev;
15+
1016
#ifdef CONFIG_OF
1117

1218
void pinctrl_dt_free_maps(struct pinctrl *p);

‎drivers/pinctrl/pinconf.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
* Author: Linus Walleij <[email protected]>
1111
*/
1212

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+
1323
#ifdef CONFIG_PINCONF
1424

1525
int pinconf_check_ops(struct pinctrl_dev *pctldev);

‎drivers/pinctrl/pinctrl-utils.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
#ifndef __PINCTRL_UTILS_H__
1010
#define __PINCTRL_UTILS_H__
1111

12+
#include <linux/pinctrl/machine.h>
13+
14+
struct pinctrl_dev;
15+
struct pinctrl_map;
16+
1217
int pinctrl_utils_reserve_map(struct pinctrl_dev *pctldev,
1318
struct pinctrl_map **map, unsigned *reserved_maps,
1419
unsigned *num_maps, unsigned reserve);

‎drivers/pinctrl/pinmux.c‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,22 @@
1313
#define pr_fmt(fmt) "pinmux core: " fmt
1414

1515
#include <linux/ctype.h>
16-
#include <linux/kernel.h>
17-
#include <linux/module.h>
18-
#include <linux/init.h>
16+
#include <linux/debugfs.h>
1917
#include <linux/device.h>
20-
#include <linux/slab.h>
21-
#include <linux/radix-tree.h>
2218
#include <linux/err.h>
19+
#include <linux/init.h>
20+
#include <linux/kernel.h>
2321
#include <linux/list.h>
24-
#include <linux/string.h>
25-
#include <linux/debugfs.h>
22+
#include <linux/module.h>
23+
#include <linux/radix-tree.h>
2624
#include <linux/seq_file.h>
25+
#include <linux/slab.h>
26+
#include <linux/string.h>
27+
2728
#include <linux/pinctrl/machine.h>
29+
#include <linux/pinctrl/pinctrl.h>
2830
#include <linux/pinctrl/pinmux.h>
31+
2932
#include "core.h"
3033
#include "pinmux.h"
3134

‎drivers/pinctrl/pinmux.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@
99
*
1010
* Author: Linus Walleij <[email protected]>
1111
*/
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+
1223
#ifdef CONFIG_PINMUX
1324

1425
int pinmux_check_ops(struct pinctrl_dev *pctldev);

‎include/linux/pinctrl/consumer.h‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
#define __LINUX_PINCTRL_CONSUMER_H
1313

1414
#include <linux/err.h>
15-
#include <linux/list.h>
16-
#include <linux/seq_file.h>
15+
#include <linux/types.h>
16+
1717
#include <linux/pinctrl/pinctrl-state.h>
1818

19+
struct device;
20+
1921
/* This struct is private to the core and should be regarded as a cookie */
2022
struct pinctrl;
2123
struct pinctrl_state;
22-
struct device;
2324

2425
#ifdef CONFIG_PINCTRL
2526

@@ -33,9 +34,8 @@ extern int pinctrl_gpio_set_config(unsigned gpio, unsigned long config);
3334

3435
extern struct pinctrl * __must_check pinctrl_get(struct device *dev);
3536
extern void pinctrl_put(struct pinctrl *p);
36-
extern struct pinctrl_state * __must_check pinctrl_lookup_state(
37-
struct pinctrl *p,
38-
const char *name);
37+
extern struct pinctrl_state * __must_check pinctrl_lookup_state(struct pinctrl *p,
38+
const char *name);
3939
extern int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s);
4040

4141
extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev);
@@ -101,9 +101,8 @@ static inline void pinctrl_put(struct pinctrl *p)
101101
{
102102
}
103103

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)
107106
{
108107
return NULL;
109108
}
@@ -145,8 +144,8 @@ static inline int pinctrl_pm_select_idle_state(struct device *dev)
145144

146145
#endif /* CONFIG_PINCTRL */
147146

148-
static inline struct pinctrl * __must_check pinctrl_get_select(
149-
struct device *dev, const char *name)
147+
static inline struct pinctrl * __must_check pinctrl_get_select(struct device *dev,
148+
const char *name)
150149
{
151150
struct pinctrl *p;
152151
struct pinctrl_state *s;
@@ -171,14 +170,13 @@ static inline struct pinctrl * __must_check pinctrl_get_select(
171170
return p;
172171
}
173172

174-
static inline struct pinctrl * __must_check pinctrl_get_select_default(
175-
struct device *dev)
173+
static inline struct pinctrl * __must_check pinctrl_get_select_default(struct device *dev)
176174
{
177175
return pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
178176
}
179177

180-
static inline struct pinctrl * __must_check devm_pinctrl_get_select(
181-
struct device *dev, const char *name)
178+
static inline struct pinctrl * __must_check devm_pinctrl_get_select(struct device *dev,
179+
const char *name)
182180
{
183181
struct pinctrl *p;
184182
struct pinctrl_state *s;
@@ -203,8 +201,7 @@ static inline struct pinctrl * __must_check devm_pinctrl_get_select(
203201
return p;
204202
}
205203

206-
static inline struct pinctrl * __must_check devm_pinctrl_get_select_default(
207-
struct device *dev)
204+
static inline struct pinctrl * __must_check devm_pinctrl_get_select_default(struct device *dev)
208205
{
209206
return devm_pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
210207
}

‎include/linux/pinctrl/devinfo.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
#ifndef PINCTRL_DEVINFO_H
1515
#define PINCTRL_DEVINFO_H
1616

17+
struct device;
18+
1719
#ifdef CONFIG_PINCTRL
1820

1921
/* The device core acts as a consumer toward pinctrl */
2022
#include <linux/pinctrl/consumer.h>
2123

24+
struct pinctrl;
25+
2226
/**
2327
* struct dev_pin_info - pin state container for devices
2428
* @p: pinctrl handle for the containing device
@@ -42,8 +46,6 @@ extern int pinctrl_init_done(struct device *dev);
4246

4347
#else
4448

45-
struct device;
46-
4749
/* Stubs if we're not using pinctrl */
4850

4951
static inline int pinctrl_bind_pins(struct device *dev)

‎include/linux/pinctrl/machine.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef __LINUX_PINCTRL_MACHINE_H
1212
#define __LINUX_PINCTRL_MACHINE_H
1313

14-
#include <linux/bug.h>
14+
#include <linux/kernel.h> /* ARRAY_SIZE() */
1515

1616
#include <linux/pinctrl/pinctrl-state.h>
1717

@@ -149,16 +149,18 @@ struct pinctrl_map {
149149
#define PIN_MAP_CONFIGS_GROUP_HOG_DEFAULT(dev, grp, cfgs) \
150150
PIN_MAP_CONFIGS_GROUP(dev, PINCTRL_STATE_DEFAULT, dev, grp, cfgs)
151151

152+
struct pinctrl_map;
153+
152154
#ifdef CONFIG_PINCTRL
153155

154156
extern int pinctrl_register_mappings(const struct pinctrl_map *map,
155-
unsigned num_maps);
157+
unsigned num_maps);
156158
extern void pinctrl_unregister_mappings(const struct pinctrl_map *map);
157159
extern void pinctrl_provide_dummies(void);
158160
#else
159161

160162
static inline int pinctrl_register_mappings(const struct pinctrl_map *map,
161-
unsigned num_maps)
163+
unsigned num_maps)
162164
{
163165
return 0;
164166
}

0 commit comments

Comments
 (0)