| Message ID | 20240530163333.2458884-9-vladimir.oltean@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a4303941c6f399816eac0a56c627008a41c9336d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Probing cleanup for the Felix DSA driver | expand |
> -----Original Message----- > From: Vladimir Oltean <vladimir.oltean@nxp.com> > Sent: Thursday, May 30, 2024 10:04 PM > To: netdev@vger.kernel.org > Cc: David S. Miller <davem@davemloft.net>; Eric Dumazet > <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni > <pabeni@redhat.com>; Claudiu Manoil <claudiu.manoil@nxp.com>; > Alexandre Belloni <alexandre.belloni@bootlin.com>; > UNGLinuxDriver@microchip.com; Andrew Lunn <andrew@lunn.ch>; Florian > Fainelli <f.fainelli@gmail.com>; Colin Foster <colin.foster@in- > advantage.com>; Russell King <linux@armlinux.org.uk> > Subject: [PATCH net-next 8/8] net: dsa: ocelot: unexport > felix_phylink_mac_ops and felix_switch_ops > > Now that the common felix_register_switch() from the umbrella driver is the > only entity that accesses these data structures, we can remove them from the > list of the exported symbols. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > --- > drivers/net/dsa/ocelot/felix.c | 6 ++---- drivers/net/dsa/ocelot/felix.h | 3 --- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index > accf737f7b69..d12c4e85baa7 100644 > --- a/drivers/net/dsa/ocelot/felix.c > +++ b/drivers/net/dsa/ocelot/felix.c > @@ -2106,15 +2106,14 @@ static void felix_get_mm_stats(struct dsa_switch > *ds, int port, > ocelot_port_get_mm_stats(ocelot, port, stats); } > > -const struct phylink_mac_ops felix_phylink_mac_ops = { > +static const struct phylink_mac_ops felix_phylink_mac_ops = { > .mac_select_pcs = felix_phylink_mac_select_pcs, > .mac_config = felix_phylink_mac_config, > .mac_link_down = felix_phylink_mac_link_down, > .mac_link_up = felix_phylink_mac_link_up, > }; > -EXPORT_SYMBOL_GPL(felix_phylink_mac_ops); > > -const struct dsa_switch_ops felix_switch_ops = { > +static const struct dsa_switch_ops felix_switch_ops = { > .get_tag_protocol = felix_get_tag_protocol, > .change_tag_protocol = felix_change_tag_protocol, > .connect_tag_protocol = felix_connect_tag_protocol, > @@ -2193,7 +2192,6 @@ const struct dsa_switch_ops felix_switch_ops = { > .port_set_host_flood = felix_port_set_host_flood, > .port_change_conduit = felix_port_change_conduit, > }; > -EXPORT_SYMBOL_GPL(felix_switch_ops); > > int felix_register_switch(struct device *dev, resource_size_t switch_base, > int num_flooding_pgids, bool ptp, > diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h > index 85b4f8616003..211991f494e3 100644 > --- a/drivers/net/dsa/ocelot/felix.h > +++ b/drivers/net/dsa/ocelot/felix.h > @@ -82,9 +82,6 @@ struct felix_tag_proto_ops { > struct netlink_ext_ack *extack); }; > > -extern const struct phylink_mac_ops felix_phylink_mac_ops; -extern const > struct dsa_switch_ops felix_switch_ops; > - > /* DSA glue / front-end for struct ocelot */ struct felix { > struct dsa_switch *ds; > -- > 2.34.1 > Reviewed-by: Sai Krishna <saikrishnag@marvell.com>
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index accf737f7b69..d12c4e85baa7 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -2106,15 +2106,14 @@ static void felix_get_mm_stats(struct dsa_switch *ds, int port, ocelot_port_get_mm_stats(ocelot, port, stats); } -const struct phylink_mac_ops felix_phylink_mac_ops = { +static const struct phylink_mac_ops felix_phylink_mac_ops = { .mac_select_pcs = felix_phylink_mac_select_pcs, .mac_config = felix_phylink_mac_config, .mac_link_down = felix_phylink_mac_link_down, .mac_link_up = felix_phylink_mac_link_up, }; -EXPORT_SYMBOL_GPL(felix_phylink_mac_ops); -const struct dsa_switch_ops felix_switch_ops = { +static const struct dsa_switch_ops felix_switch_ops = { .get_tag_protocol = felix_get_tag_protocol, .change_tag_protocol = felix_change_tag_protocol, .connect_tag_protocol = felix_connect_tag_protocol, @@ -2193,7 +2192,6 @@ const struct dsa_switch_ops felix_switch_ops = { .port_set_host_flood = felix_port_set_host_flood, .port_change_conduit = felix_port_change_conduit, }; -EXPORT_SYMBOL_GPL(felix_switch_ops); int felix_register_switch(struct device *dev, resource_size_t switch_base, int num_flooding_pgids, bool ptp, diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h index 85b4f8616003..211991f494e3 100644 --- a/drivers/net/dsa/ocelot/felix.h +++ b/drivers/net/dsa/ocelot/felix.h @@ -82,9 +82,6 @@ struct felix_tag_proto_ops { struct netlink_ext_ack *extack); }; -extern const struct phylink_mac_ops felix_phylink_mac_ops; -extern const struct dsa_switch_ops felix_switch_ops; - /* DSA glue / front-end for struct ocelot */ struct felix { struct dsa_switch *ds;
Now that the common felix_register_switch() from the umbrella driver is the only entity that accesses these data structures, we can remove them from the list of the exported symbols. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- drivers/net/dsa/ocelot/felix.c | 6 ++---- drivers/net/dsa/ocelot/felix.h | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-)