Skip to content

L
linux
Commit 8ae67496 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files
Options

net: dsa: Make PHYLINK related function static again 

Commit 77373d49 ("net: dsa: Move the phylink driver calls into
port.c") moved and exported a bunch of symbols, but they are not used
outside of net/dsa/port.c at the moment, so no reason to export them.
Reported-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Acked-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b7ffa045
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 38 deletions
net/dsa/dsa_priv.h
View file @ 8ae67496
...@@ -150,22 +150,6 @@ int dsa_port_vid_add(struct dsa_port *dp, u16 vid, u16 flags); ...@@ -150,22 +150,6 @@ int dsa_port_vid_add(struct dsa_port *dp, u16 vid, u16 flags);
int dsa_port_vid_del(struct dsa_port *dp, u16 vid); int dsa_port_vid_del(struct dsa_port *dp, u16 vid);
int dsa_port_link_register_of(struct dsa_port *dp); int dsa_port_link_register_of(struct dsa_port *dp);
void dsa_port_link_unregister_of(struct dsa_port *dp); void dsa_port_link_unregister_of(struct dsa_port *dp);
void dsa_port_phylink_validate(struct phylink_config *config,
unsigned long *supported,
struct phylink_link_state *state);
void dsa_port_phylink_mac_pcs_get_state(struct phylink_config *config,
struct phylink_link_state *state);
void dsa_port_phylink_mac_config(struct phylink_config *config,
unsigned int mode,
const struct phylink_link_state *state);
void dsa_port_phylink_mac_an_restart(struct phylink_config *config);
void dsa_port_phylink_mac_link_down(struct phylink_config *config,
unsigned int mode,
phy_interface_t interface);
void dsa_port_phylink_mac_link_up(struct phylink_config *config,
unsigned int mode,
phy_interface_t interface,
struct phy_device *phydev);
extern const struct phylink_mac_ops dsa_port_phylink_mac_ops; extern const struct phylink_mac_ops dsa_port_phylink_mac_ops;
/* slave.c */ /* slave.c */
......
net/dsa/port.c
View file @ 8ae67496
...@@ -415,9 +415,9 @@ static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp) ...@@ -415,9 +415,9 @@ static struct phy_device *dsa_port_get_phy_device(struct dsa_port *dp)
return phydev; return phydev;
} }
void dsa_port_phylink_validate(struct phylink_config *config, static void dsa_port_phylink_validate(struct phylink_config *config,
unsigned long *supported, unsigned long *supported,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
struct dsa_switch *ds = dp->ds; struct dsa_switch *ds = dp->ds;
...@@ -427,10 +427,9 @@ void dsa_port_phylink_validate(struct phylink_config *config, ...@@ -427,10 +427,9 @@ void dsa_port_phylink_validate(struct phylink_config *config,
ds->ops->phylink_validate(ds, dp->index, supported, state); ds->ops->phylink_validate(ds, dp->index, supported, state);
} }
EXPORT_SYMBOL_GPL(dsa_port_phylink_validate);
void dsa_port_phylink_mac_pcs_get_state(struct phylink_config *config, static void dsa_port_phylink_mac_pcs_get_state(struct phylink_config *config,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
struct dsa_switch *ds = dp->ds; struct dsa_switch *ds = dp->ds;
...@@ -444,11 +443,10 @@ void dsa_port_phylink_mac_pcs_get_state(struct phylink_config *config, ...@@ -444,11 +443,10 @@ void dsa_port_phylink_mac_pcs_get_state(struct phylink_config *config,
if (ds->ops->phylink_mac_link_state(ds, dp->index, state) < 0) if (ds->ops->phylink_mac_link_state(ds, dp->index, state) < 0)
state->link = 0; state->link = 0;
} }
EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_pcs_get_state);
void dsa_port_phylink_mac_config(struct phylink_config *config, static void dsa_port_phylink_mac_config(struct phylink_config *config,
unsigned int mode, unsigned int mode,
const struct phylink_link_state *state) const struct phylink_link_state *state)
{ {
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
struct dsa_switch *ds = dp->ds; struct dsa_switch *ds = dp->ds;
...@@ -458,9 +456,8 @@ void dsa_port_phylink_mac_config(struct phylink_config *config, ...@@ -458,9 +456,8 @@ void dsa_port_phylink_mac_config(struct phylink_config *config,
ds->ops->phylink_mac_config(ds, dp->index, mode, state); ds->ops->phylink_mac_config(ds, dp->index, mode, state);
} }
EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_config);
void dsa_port_phylink_mac_an_restart(struct phylink_config *config) static void dsa_port_phylink_mac_an_restart(struct phylink_config *config)
{ {
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
struct dsa_switch *ds = dp->ds; struct dsa_switch *ds = dp->ds;
...@@ -470,11 +467,10 @@ void dsa_port_phylink_mac_an_restart(struct phylink_config *config) ...@@ -470,11 +467,10 @@ void dsa_port_phylink_mac_an_restart(struct phylink_config *config)
ds->ops->phylink_mac_an_restart(ds, dp->index); ds->ops->phylink_mac_an_restart(ds, dp->index);
} }
EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_an_restart);
void dsa_port_phylink_mac_link_down(struct phylink_config *config, static void dsa_port_phylink_mac_link_down(struct phylink_config *config,
unsigned int mode, unsigned int mode,
phy_interface_t interface) phy_interface_t interface)
{ {
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
struct phy_device *phydev = NULL; struct phy_device *phydev = NULL;
...@@ -491,12 +487,11 @@ void dsa_port_phylink_mac_link_down(struct phylink_config *config, ...@@ -491,12 +487,11 @@ void dsa_port_phylink_mac_link_down(struct phylink_config *config,
ds->ops->phylink_mac_link_down(ds, dp->index, mode, interface); ds->ops->phylink_mac_link_down(ds, dp->index, mode, interface);
} }
EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_link_down);
void dsa_port_phylink_mac_link_up(struct phylink_config *config, static void dsa_port_phylink_mac_link_up(struct phylink_config *config,
unsigned int mode, unsigned int mode,
phy_interface_t interface, phy_interface_t interface,
struct phy_device *phydev) struct phy_device *phydev)
{ {
struct dsa_port *dp = container_of(config, struct dsa_port, pl_config); struct dsa_port *dp = container_of(config, struct dsa_port, pl_config);
struct dsa_switch *ds = dp->ds; struct dsa_switch *ds = dp->ds;
...@@ -509,7 +504,6 @@ void dsa_port_phylink_mac_link_up(struct phylink_config *config, ...@@ -509,7 +504,6 @@ void dsa_port_phylink_mac_link_up(struct phylink_config *config,
ds->ops->phylink_mac_link_up(ds, dp->index, mode, interface, phydev); ds->ops->phylink_mac_link_up(ds, dp->index, mode, interface, phydev);
} }
EXPORT_SYMBOL_GPL(dsa_port_phylink_mac_link_up);
const struct phylink_mac_ops dsa_port_phylink_mac_ops = { const struct phylink_mac_ops dsa_port_phylink_mac_ops = {
.validate = dsa_port_phylink_validate, .validate = dsa_port_phylink_validate,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7