net: dsa: eliminate <linux/dsa/loop.h>

There is no reason at all to export these data types to the global
include directory.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20260406212158.721806-5-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c
index b41254b3ac4251ba4baba320cb6821602f2d7cf5..7058faf23592bc22b4e5bedec8049e83c6b9faf4 100644 (file)
--- a/drivers/net/dsa/dsa_loop.c
+++ b/drivers/net/dsa/dsa_loop.c
@@ -14,13 +14,46 @@
 #include <linux/workqueue.h>
 #include <linux/module.h>
 #include <linux/if_bridge.h>
-#include <linux/dsa/loop.h>
+#include <linux/if_vlan.h>
+#include <linux/types.h>
 #include <net/dsa.h>
 
 #define DSA_LOOP_NUM_PORTS     6
 #define DSA_LOOP_CPU_PORT      (DSA_LOOP_NUM_PORTS - 1)
 #define NUM_FIXED_PHYS         (DSA_LOOP_NUM_PORTS - 2)
 
+struct dsa_loop_vlan {
+       u16 members;
+       u16 untagged;
+};
+
+struct dsa_loop_mib_entry {
+       char name[ETH_GSTRING_LEN];
+       unsigned long val;
+};
+
+enum dsa_loop_mib_counters {
+       DSA_LOOP_PHY_READ_OK,
+       DSA_LOOP_PHY_READ_ERR,
+       DSA_LOOP_PHY_WRITE_OK,
+       DSA_LOOP_PHY_WRITE_ERR,
+       __DSA_LOOP_CNT_MAX,
+};
+
+struct dsa_loop_port {
+       struct dsa_loop_mib_entry mib[__DSA_LOOP_CNT_MAX];
+       u16 pvid;
+       int mtu;
+};
+
+struct dsa_loop_priv {
+       struct mii_bus  *bus;
+       unsigned int    port_base;
+       struct dsa_loop_vlan vlans[VLAN_N_VID];
+       struct net_device *netdev;
+       struct dsa_loop_port ports[DSA_MAX_PORTS];
+};
+
 struct dsa_loop_pdata {
        /* Must be first, such that dsa_register_switch() can access this
         * without gory pointer manipulations

diff --git a/include/linux/dsa/loop.h b/include/linux/dsa/loop.h
deleted file mode 100644 (file)
index b8fef35..0000000
--- a/include/linux/dsa/loop.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef DSA_LOOP_H
-#define DSA_LOOP_H
-
-#include <linux/if_vlan.h>
-#include <linux/types.h>
-#include <linux/ethtool.h>
-#include <net/dsa.h>
-
-struct dsa_loop_vlan {
-       u16 members;
-       u16 untagged;
-};
-
-struct dsa_loop_mib_entry {
-       char name[ETH_GSTRING_LEN];
-       unsigned long val;
-};
-
-enum dsa_loop_mib_counters {
-       DSA_LOOP_PHY_READ_OK,
-       DSA_LOOP_PHY_READ_ERR,
-       DSA_LOOP_PHY_WRITE_OK,
-       DSA_LOOP_PHY_WRITE_ERR,
-       __DSA_LOOP_CNT_MAX,
-};
-
-struct dsa_loop_port {
-       struct dsa_loop_mib_entry mib[__DSA_LOOP_CNT_MAX];
-       u16 pvid;
-       int mtu;
-};
-
-struct dsa_loop_priv {
-       struct mii_bus  *bus;
-       unsigned int    port_base;
-       struct dsa_loop_vlan vlans[VLAN_N_VID];
-       struct net_device *netdev;
-       struct dsa_loop_port ports[DSA_MAX_PORTS];
-};
-
-#endif /* DSA_LOOP_H */