Skip to content

Commit 937e7a3

Browse files
andy-shevlinusw
authored andcommitted
pinctrl: nomadik: Add missing header(s)
Do not imply that some of the generic headers may be always included. Instead, include explicitly what we are direct user of. While at it, sort headers alphabetically. Fixes: e5530ad ("pinctrl: Clean up headers") Cc: Randy Dunlap <[email protected]> Reported-by: Arnd Bergmann <[email protected]> Reported-by: kernel test robot <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 5626af8 commit 937e7a3

File tree

8 files changed

+54
-31
lines changed

8 files changed

+54
-31
lines changed

drivers/pinctrl/nomadik/pinctrl-ab8500.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
*/
77

88
#include <linux/kernel.h>
9-
#include <linux/gpio/driver.h>
109
#include <linux/pinctrl/pinctrl.h>
10+
1111
#include <linux/mfd/abx500/ab8500.h>
12+
1213
#include "pinctrl-abx500.h"
1314

1415
/* All the pins that can be used for GPIO and some other functions */

drivers/pinctrl/nomadik/pinctrl-ab8505.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
*/
77

88
#include <linux/kernel.h>
9-
#include <linux/gpio/driver.h>
109
#include <linux/pinctrl/pinctrl.h>
10+
1111
#include <linux/mfd/abx500/ab8500.h>
12+
1213
#include "pinctrl-abx500.h"
1314

1415
/* All the pins that can be used for GPIO and some other functions */

drivers/pinctrl/nomadik/pinctrl-abx500.c

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,37 @@
66
*
77
* Driver allows to use AxB5xx unused pins to be used as GPIO
88
*/
9-
#include <linux/kernel.h>
10-
#include <linux/types.h>
11-
#include <linux/slab.h>
12-
#include <linux/init.h>
9+
#include <linux/bitops.h>
1310
#include <linux/err.h>
14-
#include <linux/of.h>
15-
#include <linux/of_device.h>
16-
#include <linux/platform_device.h>
1711
#include <linux/gpio/driver.h>
12+
#include <linux/init.h>
13+
#include <linux/interrupt.h>
1814
#include <linux/irq.h>
1915
#include <linux/irqdomain.h>
20-
#include <linux/interrupt.h>
21-
#include <linux/bitops.h>
16+
#include <linux/kernel.h>
17+
#include <linux/of.h>
18+
#include <linux/of_device.h>
19+
#include <linux/platform_device.h>
20+
#include <linux/seq_file.h>
21+
#include <linux/slab.h>
22+
#include <linux/types.h>
23+
2224
#include <linux/mfd/abx500.h>
2325
#include <linux/mfd/abx500/ab8500.h>
24-
#include <linux/pinctrl/pinctrl.h>
26+
2527
#include <linux/pinctrl/consumer.h>
26-
#include <linux/pinctrl/pinmux.h>
27-
#include <linux/pinctrl/pinconf.h>
28-
#include <linux/pinctrl/pinconf-generic.h>
2928
#include <linux/pinctrl/machine.h>
29+
#include <linux/pinctrl/pinconf-generic.h>
30+
#include <linux/pinctrl/pinconf.h>
31+
#include <linux/pinctrl/pinctrl.h>
32+
#include <linux/pinctrl/pinmux.h>
3033

31-
#include "pinctrl-abx500.h"
3234
#include "../core.h"
3335
#include "../pinconf.h"
3436
#include "../pinctrl-utils.h"
3537

38+
#include "pinctrl-abx500.h"
39+
3640
/*
3741
* GPIO registers offset
3842
* Bank: 0x10

drivers/pinctrl/nomadik/pinctrl-abx500.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
#ifndef PINCTRL_PINCTRL_ABx500_H
33
#define PINCTRL_PINCTRL_ABx500_H
44

5+
#include <linux/types.h>
6+
7+
struct pinctrl_pin_desc;
8+
59
/* Package definitions */
610
#define PINCTRL_AB8500 0
711
#define PINCTRL_AB8505 1

drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <linux/kernel.h>
3+
#include <linux/types.h>
4+
35
#include <linux/pinctrl/pinctrl.h>
6+
47
#include "pinctrl-nomadik.h"
58

69
/* All the pins that can be used for GPIO and some other functions */

drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// SPDX-License-Identifier: GPL-2.0
22
#include <linux/kernel.h>
3+
#include <linux/types.h>
4+
35
#include <linux/pinctrl/pinctrl.h>
6+
47
#include "pinctrl-nomadik.h"
58

69
/* All the pins that can be used for GPIO and some other functions */

drivers/pinctrl/nomadik/pinctrl-nomadik.c

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,34 @@
77
* Rewritten based on work by Prafulla WADASKAR <[email protected]>
88
* Copyright (C) 2011-2013 Linus Walleij <[email protected]>
99
*/
10-
#include <linux/kernel.h>
11-
#include <linux/init.h>
12-
#include <linux/device.h>
13-
#include <linux/platform_device.h>
14-
#include <linux/io.h>
10+
#include <linux/bitops.h>
1511
#include <linux/clk.h>
12+
#include <linux/device.h>
1613
#include <linux/err.h>
1714
#include <linux/gpio/driver.h>
18-
#include <linux/spinlock.h>
15+
#include <linux/init.h>
1916
#include <linux/interrupt.h>
20-
#include <linux/slab.h>
21-
#include <linux/of_device.h>
17+
#include <linux/io.h>
18+
#include <linux/kernel.h>
2219
#include <linux/of_address.h>
23-
#include <linux/bitops.h>
20+
#include <linux/of_device.h>
21+
#include <linux/platform_device.h>
22+
#include <linux/seq_file.h>
23+
#include <linux/slab.h>
24+
#include <linux/spinlock.h>
25+
26+
/* Since we request GPIOs from ourself */
27+
#include <linux/pinctrl/consumer.h>
2428
#include <linux/pinctrl/machine.h>
29+
#include <linux/pinctrl/pinconf.h>
2530
#include <linux/pinctrl/pinctrl.h>
2631
#include <linux/pinctrl/pinmux.h>
27-
#include <linux/pinctrl/pinconf.h>
28-
/* Since we request GPIOs from ourself */
29-
#include <linux/pinctrl/consumer.h>
30-
#include "pinctrl-nomadik.h"
32+
3133
#include "../core.h"
3234
#include "../pinctrl-utils.h"
3335

36+
#include "pinctrl-nomadik.h"
37+
3438
/*
3539
* The GPIO module in the Nomadik family of Systems-on-Chip is an
3640
* AMBA device, managing 32 pins and alternate functions. The logic block
@@ -907,8 +911,6 @@ static int nmk_gpio_get_mode(struct nmk_gpio_chip *nmk_chip, int offset)
907911
return (afunc ? NMK_GPIO_ALT_A : 0) | (bfunc ? NMK_GPIO_ALT_B : 0);
908912
}
909913

910-
#include <linux/seq_file.h>
911-
912914
static void nmk_gpio_dbg_show_one(struct seq_file *s,
913915
struct pinctrl_dev *pctldev, struct gpio_chip *chip,
914916
unsigned offset, unsigned gpio)

drivers/pinctrl/nomadik/pinctrl-nomadik.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
#ifndef PINCTRL_PINCTRL_NOMADIK_H
33
#define PINCTRL_PINCTRL_NOMADIK_H
44

5+
#include <linux/kernel.h>
6+
#include <linux/types.h>
7+
8+
#include <linux/pinctrl/pinctrl.h>
9+
510
/* Package definitions */
611
#define PINCTRL_NMK_STN8815 0
712
#define PINCTRL_NMK_DB8500 1

0 commit comments

Comments
 (0)