net: dsa: remove gratuitous use of dsa_is_{user,dsa,cpu}_port

Find the occurrences of dsa_is_{user,dsa,cpu}_port where a struct
dsa_port *dp was already available in the function scope, and replace
them with the dsa_port_is_{user,dsa,cpu} equivalent function which uses
that dp directly and does not perform another hidden dsa_to_port().

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 3b14c9b6a922008cd7a0eb894557fc3fc9b6cf48..bf671306b560455af4102cca934003ff1ff61aa6 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -523,7 +523,7 @@ static bool dsa_port_can_apply_vlan_filtering(struct dsa_port *dp,
         * enter an inconsistent state: deny changing the VLAN awareness state
         * as long as we have 8021q uppers.
         */
-       if (vlan_filtering && dsa_is_user_port(ds, dp->index)) {
+       if (vlan_filtering && dsa_port_is_user(dp)) {
                struct net_device *upper_dev, *slave = dp->slave;
                struct net_device *br = dp->bridge_dev;
                struct list_head *iter;
@@ -1038,7 +1038,7 @@ static void dsa_port_phylink_mac_link_down(struct phylink_config *config,
        struct phy_device *phydev = NULL;
        struct dsa_switch *ds = dp->ds;
 
-       if (dsa_is_user_port(ds, dp->index))
+       if (dsa_port_is_user(dp))
                phydev = dp->slave->phydev;
 
        if (!ds->ops->phylink_mac_link_down) {