Commit 0d0350c4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'phylink-remove-pcs_poll' 



Russell King says:

====================
net: phylink: remove pcs_poll

This small series removes the now unused pcs_poll members from DSA and
phylink. "git grep pcs_poll drivers/net/ net/" on net-next confirms that
the only places that reference this are in DSA core code and phylink
code:

drivers/net/phy/phylink.c:              if (pl->config->pcs_poll || pcs->poll)
drivers/net/phy/phylink.c:              poll |= pl->config->pcs_poll;
net/dsa/port.c: dp->pl_config.pcs_poll = ds->pcs_poll;
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e7f27420 64b4a0f8

drivers/net/phy/phylink.c

+1 −2
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ void phylink_set_pcs(struct phylink *pl, struct phylink_pcs *pcs) 


	if (!pl->phylink_disable_state &&

	    pl->cfg_link_an_mode == MLO_AN_INBAND) {

		if (pl->config->pcs_poll || pcs->poll)

		if (pcs->poll)

			mod_timer(&pl->link_poll, jiffies + HZ);

		else

			del_timer(&pl->link_poll);
@@ -1673,7 +1673,6 @@ void phylink_start(struct phylink *pl) 
		poll |= pl->config->poll_fixed_state;

		break;

	case MLO_AN_INBAND:

		poll |= pl->config->pcs_poll;

		if (pl->pcs)

			poll |= pl->pcs->poll;

		break;

include/linux/phylink.h

+0 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ enum phylink_op_type { 
 * @type: operation type of PHYLINK instance

 * @legacy_pre_march2020: driver has not been updated for March 2020 updates

 *	(See commit 7cceb599d15d ("net: phylink: avoid mac_config calls")

 * @pcs_poll: MAC PCS cannot provide link change interrupt

 * @poll_fixed_state: if true, starts link_poll,

 *		      if MAC link is at %MLO_AN_FIXED mode.

 * @ovr_an_inband: if true, override PCS to MLO_AN_INBAND
@@ -100,7 +99,6 @@ struct phylink_config { 
	struct device *dev;

	enum phylink_op_type type;

	bool legacy_pre_march2020;

	bool pcs_poll;

	bool poll_fixed_state;

	bool ovr_an_inband;

	void (*get_fixed_state)(struct phylink_config *config,

include/net/dsa.h

+0 −5
Original line number Diff line number Diff line
@@ -391,11 +391,6 @@ struct dsa_switch { 
	 */

	u32			vlan_filtering:1;



	/* MAC PCS does not provide link state change interrupt, and requires

	 * polling. Flag passed on to PHYLINK.

	 */

	u32			pcs_poll:1;



	/* For switches that only have the MRU configurable. To ensure the

	 * configured MTU is not exceeded, normalization of MRU on all bridged

	 * interfaces is needed.

net/dsa/port.c

+0 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,6 @@ static int dsa_port_phylink_register(struct dsa_port *dp) 


	dp->pl_config.dev = ds->dev;

	dp->pl_config.type = PHYLINK_DEV;

	dp->pl_config.pcs_poll = ds->pcs_poll;



	err = dsa_port_phylink_create(dp);

	if (err)