[PATCH 06/13] [net-next] net: replace linux/gpio.h inclusions
From: Arnd Bergmann <arnd@kernel.org>
Date: 2026-06-29 13:27:29
Also in:
linux-arm-kernel, linux-gpio, linux-m68k, linux-media, linux-mips, linux-phy, linux-rockchip, linux-samsung-soc, linux-sh, linux-sound, linux-sunxi, lkml, netdev
Subsystem:
applied micro (apm) x-gene soc ethernet driver, broadcom b53/sf2 ethernet switch driver, ethernet phy library, microchip ksz series ethernet switch driver, networking drivers, networking [dsa], the rest · Maintainers:
Iyappan Subramanian, Keyur Chudgar, Quan Nguyen, Florian Fainelli, Jonas Gorski, Andrew Lunn, Heiner Kallweit, Woojung Huh, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Vladimir Oltean, Linus Torvalds
From: Arnd Bergmann <arnd@arndb.de> linux/gpio.h should no longer be used, change these in drivers/net to linux/gpio/consumer.h where possible, with b53 being the only one still using linux/gpio/legacy.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/dsa/b53/b53_priv.h | 3 ++- drivers/net/dsa/microchip/ksz8.c | 2 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- drivers/net/phy/mdio_device.c | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h
index cd27a7344e89..29cca7945df7 100644
--- a/drivers/net/dsa/b53/b53_priv.h
+++ b/drivers/net/dsa/b53/b53_priv.h@@ -23,6 +23,7 @@ #include <linux/mutex.h> #include <linux/phylink.h> #include <linux/etherdevice.h> +#include <linux/gpio/consumer.h> #include <net/dsa.h> #include "b53_regs.h"
@@ -467,7 +468,7 @@ static inline void b53_arl_search_read(struct b53_device *dev, u8 idx, #ifdef CONFIG_BCM47XX #include <linux/bcm47xx_nvram.h> -#include <linux/gpio.h> +#include <linux/gpio/legacy.h> #include <bcm47xx_board.h> static inline struct gpio_desc *b53_switch_get_reset_gpio(struct b53_device *dev) {
diff --git a/drivers/net/dsa/microchip/ksz8.c b/drivers/net/dsa/microchip/ksz8.c
index 138f2ab0774e..586916570a84 100644
--- a/drivers/net/dsa/microchip/ksz8.c
+++ b/drivers/net/dsa/microchip/ksz8.c@@ -18,7 +18,7 @@ #include <linux/delay.h> #include <linux/dsa/ksz_common.h> #include <linux/export.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/if_vlan.h> #include <linux/kernel.h> #include <linux/module.h>
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index fc7341a5cbb7..42174249ef61 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c@@ -15,7 +15,7 @@ #include <linux/clk.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/mii.h>
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 3b2951030a38..507db46daf2b 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c@@ -7,7 +7,7 @@ * Keyur Chudgar <kchudgar@apm.com> */ -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include "xgene_enet_main.h" #include "xgene_enet_hw.h" #include "xgene_enet_sgmac.h"
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 48b94ce77490..88c5c52e0e38 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c@@ -16,7 +16,7 @@ #include <linux/net_tstamp.h> #include <linux/ptp_classify.h> #include <linux/ptp_pch.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #define PCH_GBE_MAR_ENTRIES 16 #define PCH_GBE_SHORT_PKT 64
diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 56080d3d2d25..a18263d5bb02 100644
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c@@ -8,7 +8,7 @@ #include <linux/delay.h> #include <linux/errno.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h> #include <linux/init.h> #include <linux/interrupt.h>
--
2.39.5