Skip to content

Commit 82cc14c

Browse files
committed
pinctrl: Replace kernel.h by what is actually being used
The kernel.h is a mess of unrelated things and we only used it as a proxy to array_size.h, hence switch from former to the latter. While at it, group and sort the headers where it makes sense. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent 3cd39bc commit 82cc14c

6 files changed

Lines changed: 24 additions & 18 deletions

File tree

drivers/pinctrl/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
*/
1313
#define pr_fmt(fmt) "pinctrl core: " fmt
1414

15+
#include <linux/array_size.h>
1516
#include <linux/debugfs.h>
1617
#include <linux/device.h>
1718
#include <linux/err.h>
1819
#include <linux/export.h>
1920
#include <linux/init.h>
20-
#include <linux/kernel.h>
2121
#include <linux/kref.h>
2222
#include <linux/list.h>
2323
#include <linux/seq_file.h>

drivers/pinctrl/pinconf-generic.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@
1010

1111
#define pr_fmt(fmt) "generic pinconfig core: " fmt
1212

13-
#include <linux/kernel.h>
14-
#include <linux/module.h>
15-
#include <linux/init.h>
13+
#include <linux/array_size.h>
14+
#include <linux/debugfs.h>
1615
#include <linux/device.h>
16+
#include <linux/init.h>
17+
#include <linux/module.h>
18+
#include <linux/of.h>
1719
#include <linux/slab.h>
18-
#include <linux/debugfs.h>
1920
#include <linux/seq_file.h>
20-
#include <linux/pinctrl/pinctrl.h>
21-
#include <linux/pinctrl/pinconf.h>
21+
2222
#include <linux/pinctrl/pinconf-generic.h>
23-
#include <linux/of.h>
23+
#include <linux/pinctrl/pinconf.h>
24+
#include <linux/pinctrl/pinctrl.h>
25+
2426
#include "core.h"
2527
#include "pinconf.h"
2628
#include "pinctrl-utils.h"

drivers/pinctrl/pinconf.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@
99
*/
1010
#define pr_fmt(fmt) "pinconfig core: " fmt
1111

12-
#include <linux/kernel.h>
13-
#include <linux/module.h>
14-
#include <linux/init.h>
15-
#include <linux/device.h>
16-
#include <linux/slab.h>
12+
#include <linux/array_size.h>
1713
#include <linux/debugfs.h>
14+
#include <linux/device.h>
15+
#include <linux/init.h>
16+
#include <linux/module.h>
1817
#include <linux/seq_file.h>
18+
#include <linux/slab.h>
19+
1920
#include <linux/pinctrl/machine.h>
20-
#include <linux/pinctrl/pinctrl.h>
2121
#include <linux/pinctrl/pinconf.h>
22+
#include <linux/pinctrl/pinctrl.h>
23+
2224
#include "core.h"
2325
#include "pinconf.h"
2426

drivers/pinctrl/pinctrl-utils.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
*
77
* Author: Laxman Dewangan <ldewangan@nvidia.com>
88
*/
9+
#include <linux/array_size.h>
910
#include <linux/device.h>
1011
#include <linux/export.h>
11-
#include <linux/kernel.h>
12-
#include <linux/pinctrl/pinctrl.h>
1312
#include <linux/of.h>
1413
#include <linux/slab.h>
14+
15+
#include <linux/pinctrl/pinctrl.h>
16+
1517
#include "core.h"
1618
#include "pinctrl-utils.h"
1719

drivers/pinctrl/pinmux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
*/
1313
#define pr_fmt(fmt) "pinmux core: " fmt
1414

15+
#include <linux/array_size.h>
1516
#include <linux/ctype.h>
1617
#include <linux/debugfs.h>
1718
#include <linux/device.h>
1819
#include <linux/err.h>
1920
#include <linux/init.h>
20-
#include <linux/kernel.h>
2121
#include <linux/list.h>
2222
#include <linux/module.h>
2323
#include <linux/radix-tree.h>

include/linux/pinctrl/machine.h

Lines changed: 1 addition & 1 deletion
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/kernel.h> /* ARRAY_SIZE() */
14+
#include <linux/array_size.h>
1515

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

0 commit comments

Comments
 (0)