Commit 57d77986 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65c563a6

net/dsa/port.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {