| Message ID | 20180918220437.32538-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 22d7fe4984a23fea13f2fbc285e505624469de2a |
| Headers | show |
| Series | pinctrl: mtk: Fix up GPIO includes | expand |
diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c index 7cfab0cfd18c..c27597cd3931 100644 --- a/drivers/pinctrl/mediatek/pinctrl-moore.c +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c @@ -8,6 +8,7 @@ * */ +#include <linux/gpio/driver.h> #include "pinctrl-moore.h" #define PINCTRL_PINCTRL_DEV KBUILD_MODNAME diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.h b/drivers/pinctrl/mediatek/pinctrl-moore.h index 74a6568a9220..e1b4b82b9d3d 100644 --- a/drivers/pinctrl/mediatek/pinctrl-moore.h +++ b/drivers/pinctrl/mediatek/pinctrl-moore.h @@ -8,8 +8,6 @@ #ifndef __PINCTRL_MOORE_H #define __PINCTRL_MOORE_H -#include <linux/gpio.h> -#include <linux/gpio/driver.h> #include <linux/io.h> #include <linux/init.h> #include <linux/of.h> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c index e8a2066a4d15..167ebf43c089 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c @@ -8,7 +8,7 @@ #include <linux/device.h> #include <linux/err.h> -#include <linux/gpio.h> +#include <linux/gpio/driver.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/of_irq.h> diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c index 9f4224f9d605..4cf0fea30b7d 100644 --- a/drivers/pinctrl/mediatek/pinctrl-paris.c +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c @@ -9,6 +9,7 @@ * Hongzhou.Yang <hongzhou.yang@mediatek.com> */ +#include <linux/gpio/driver.h> #include <dt-bindings/pinctrl/mt65xx.h> #include "pinctrl-paris.h" diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.h b/drivers/pinctrl/mediatek/pinctrl-paris.h index e4d204e4ce8d..37146caa667d 100644 --- a/drivers/pinctrl/mediatek/pinctrl-paris.h +++ b/drivers/pinctrl/mediatek/pinctrl-paris.h @@ -9,8 +9,6 @@ #ifndef __PINCTRL_PARIS_H #define __PINCTRL_PARIS_H -#include <linux/gpio.h> -#include <linux/gpio/driver.h> #include <linux/io.h> #include <linux/init.h> #include <linux/of.h>
Include only <linux/gpio/driver.h> since this is a driver, not a consumer. Cc: Sean Wang <sean.wang@mediatek.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/pinctrl/mediatek/pinctrl-moore.c | 1 + drivers/pinctrl/mediatek/pinctrl-moore.h | 2 -- drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 2 +- drivers/pinctrl/mediatek/pinctrl-paris.c | 1 + drivers/pinctrl/mediatek/pinctrl-paris.h | 2 -- 5 files changed, 3 insertions(+), 5 deletions(-) -- 2.17.1