From: Arnd Bergmann <arnd@kernel.org>
To: linux-gpio@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/8] gpiolib: split linux/gpio/driver.h out of linux/gpio.h
Date: Thu, 26 Jan 2023 14:27:59 +0100 [thread overview]
Message-ID: <20230126132801.2042371-7-arnd@kernel.org> (raw)
In-Reply-To: <20230126132801.2042371-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
Almost all gpio drivers include linux/gpio/driver.h, and other
files should not rely on includes from this header.
Remove the indirect include from here and include the correct
headers directly from where they are used.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-omap1/irq.c | 1 +
arch/arm/mach-orion5x/board-rd88f5182.c | 1 +
arch/arm/mach-s3c/s3c64xx.c | 1 +
arch/arm/mach-sa1100/assabet.c | 1 +
arch/arm/plat-orion/gpio.c | 1 +
drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c | 1 +
include/linux/gpio.h | 2 --
include/linux/mfd/ucb1x00.h | 1 +
8 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 9ccc784fd614..bfc7ab010ae2 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -41,6 +41,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/irqdomain.h>
#include <asm/irq.h>
#include <asm/exception.h>
diff --git a/arch/arm/mach-orion5x/board-rd88f5182.c b/arch/arm/mach-orion5x/board-rd88f5182.c
index 596601367989..1c14e49a90a6 100644
--- a/arch/arm/mach-orion5x/board-rd88f5182.c
+++ b/arch/arm/mach-orion5x/board-rd88f5182.c
@@ -9,6 +9,7 @@
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pci.h>
#include <linux/irq.h>
diff --git a/arch/arm/mach-s3c/s3c64xx.c b/arch/arm/mach-s3c/s3c64xx.c
index c20163e6a8b4..c5aa4d8ed8bd 100644
--- a/arch/arm/mach-s3c/s3c64xx.c
+++ b/arch/arm/mach-s3c/s3c64xx.c
@@ -24,6 +24,7 @@
#include <linux/platform_device.h>
#include <linux/reboot.h>
#include <linux/io.h>
+#include <linux/of.h>
#include <linux/clk/samsung.h>
#include <linux/dma-mapping.h>
#include <linux/irq.h>
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 04f8a1680bc1..06e7b1358226 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -12,6 +12,7 @@
#include <linux/errno.h>
#include <linux/gpio/gpio-reg.h>
#include <linux/gpio/machine.h>
+#include <linux/gpio/driver.h>
#include <linux/gpio_keys.h>
#include <linux/ioport.h>
#include <linux/platform_data/sa11x0-serial.h>
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 3ef9ecdd6343..4946d8066f6a 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -19,6 +19,7 @@
#include <linux/bitops.h>
#include <linux/io.h>
#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
#include <linux/leds.h>
#include <linux/of.h>
#include <linux/of_irq.h>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
index 9540a05247c2..89c8829528c2 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
#include <net/mac80211.h>
#include <linux/bcma/bcma_driver_chipcommon.h>
+#include <linux/gpio.h>
#include <linux/gpio/driver.h>
#include <linux/gpio/machine.h>
#include <linux/gpio/consumer.h>
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 57ec3975b656..06a33339994e 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -54,8 +54,6 @@ struct gpio {
};
#ifdef CONFIG_GPIOLIB
-#include <linux/compiler.h>
-#include <linux/gpio/driver.h>
#include <linux/gpio/consumer.h>
/*
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
index 9aed2797d3d5..2e65354fc7b8 100644
--- a/include/linux/mfd/ucb1x00.h
+++ b/include/linux/mfd/ucb1x00.h
@@ -9,6 +9,7 @@
#include <linux/device.h>
#include <linux/mfd/mcp.h>
+#include <linux/gpio/driver.h>
#include <linux/gpio.h>
#include <linux/mutex.h>
--
2.39.0
next prev parent reply other threads:[~2023-01-26 13:28 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 13:27 [PATCH 0/8] gpiolib cleanups Arnd Bergmann
2023-01-26 13:27 ` [PATCH 1/8] gpiolib: remove empty asm/gpio.h files Arnd Bergmann
2023-01-27 9:41 ` Bartosz Golaszewski
2023-01-27 13:04 ` Linus Walleij
2023-01-26 13:27 ` [PATCH 2/8] gpiolib: coldfire: remove custom asm/gpio.h Arnd Bergmann
2023-01-27 9:41 ` Bartosz Golaszewski
2023-01-27 13:05 ` Linus Walleij
2023-01-26 13:27 ` [PATCH 3/8] gpiolib: remove asm-generic/gpio.h Arnd Bergmann
2023-01-26 13:46 ` Andy Shevchenko
2023-01-26 15:43 ` Arnd Bergmann
2023-01-27 13:07 ` Linus Walleij
2023-01-27 13:14 ` Arnd Bergmann
2023-01-26 13:27 ` [PATCH 4/8] gpiolib: remove gpio_set_debounce Arnd Bergmann
2023-01-26 13:50 ` Andy Shevchenko
2023-01-26 15:30 ` Arnd Bergmann
2023-01-27 13:09 ` Linus Walleij
2023-01-26 13:27 ` [PATCH 5/8] gpiolib: remove legacy gpio_export Arnd Bergmann
2023-01-26 14:00 ` Andy Shevchenko
2023-01-26 16:02 ` Arnd Bergmann
2023-01-27 13:09 ` Linus Walleij
2023-01-26 13:27 ` Arnd Bergmann [this message]
2023-01-26 14:04 ` [PATCH 6/8] gpiolib: split linux/gpio/driver.h out of linux/gpio.h Andy Shevchenko
2023-01-26 14:51 ` Arnd Bergmann
2023-01-27 13:15 ` Linus Walleij
2023-01-26 13:28 ` [PATCH 7/8] gpiolib: split of_mm_gpio_chip out of linux/of_gpio.h Arnd Bergmann
2023-01-26 14:08 ` Andy Shevchenko
2023-01-26 14:54 ` Arnd Bergmann
2023-01-27 13:17 ` Linus Walleij
2023-01-26 13:28 ` [PATCH 8/8] gpiolib: move of_gpio_flags into gpiolib-of.c Arnd Bergmann
2023-01-26 14:09 ` Andy Shevchenko
2023-01-26 14:47 ` Arnd Bergmann
2023-01-27 8:53 ` Andy Shevchenko
2023-01-27 9:43 ` Bartosz Golaszewski
2023-01-27 9:46 ` Arnd Bergmann
2023-01-27 9:48 ` Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230126132801.2042371-7-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=bartosz.golaszewski@linaro.org \
--cc=christophe.leroy@csgroup.eu \
--cc=dmitry.torokhov@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.