net: sfp: move tx disable on device down to main state machine (1539e0d3) · Commits · 戴 / test

Move the tx disable assertion on device down to the main state machine. Signed-off-by:

drivers/net/phy/sfp.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -1554,15 +1554,8 @@ static void sfp_sm_device(struct sfp *sfp, unsigned int event)
		break;

		case SFP_DEV_UP:
		if (event == SFP_E_DEV_DOWN) {
		/* If the module has a PHY, avoid raising TX disable
		* as this resets the PHY. Otherwise, raise it to
		* turn the laser off.
		*/
		if (!sfp->mod_phy)
		sfp_module_tx_disable(sfp);
		if (event == SFP_E_DEV_DOWN)
		sfp->sm_dev_state = SFP_DEV_DOWN;
		}
		break;
		}
		}
		@@ -1624,6 +1617,7 @@ static void sfp_sm_main(struct sfp *sfp, unsigned int event)
		sfp_sm_link_down(sfp);
		if (sfp->mod_phy)
		sfp_sm_phy_detach(sfp);
		sfp_module_tx_disable(sfp);
		sfp_sm_next(sfp, SFP_S_DOWN, 0);
		return;
		}