diff options
| author | Vivien Didelot <vivien.didelot@gmail.com> | 2019-08-19 22:00:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-20 21:33:49 +0200 |
| commit | 74be4babe72fd1ed1bba6b52d0bdc0d1e13f7af8 (patch) | |
| tree | 1e0bf529fdcd8013cc0c88fcd214002e0587ca04 /drivers/net/dsa/mt7530.c | |
| parent | net: dsa: use a single switch statement for port setup (diff) | |
| download | linux-74be4babe72fd1ed1bba6b52d0bdc0d1e13f7af8.tar.xz linux-74be4babe72fd1ed1bba6b52d0bdc0d1e13f7af8.zip | |
net: dsa: do not enable or disable non user ports
The .port_enable and .port_disable operations are currently only
called for user ports, hence assuming they have a slave device. In
preparation for using these operations for other port types as well,
simply guard all implementations against non user ports and return
directly in such case.
Note that bcm_sf2_sw_suspend() currently calls bcm_sf2_port_disable()
(and thus b53_disable_port()) against the user and CPU ports, so do
not guards those functions. They will be called for unused ports in
the future, but that was expected by those drivers anyway.
Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/mt7530.c')
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 3181e95586d6..c48e29486b10 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -726,6 +726,9 @@ mt7530_port_enable(struct dsa_switch *ds, int port, { struct mt7530_priv *priv = ds->priv; + if (!dsa_is_user_port(ds, port)) + return 0; + mutex_lock(&priv->reg_mutex); /* Setup the MAC for the user port */ @@ -751,6 +754,9 @@ mt7530_port_disable(struct dsa_switch *ds, int port) { struct mt7530_priv *priv = ds->priv; + if (!dsa_is_user_port(ds, port)) + return; + mutex_lock(&priv->reg_mutex); /* Clear up all port matrix which could be restored in the next |