Commit 0936ebc4 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: sfp: rename sfp_sm_ins_next() as sfp_sm_mod_next() 



sfp_sm_ins_next() modifies the module state machine.  Change it's name
to reflect this.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1539e0d3

drivers/net/phy/sfp.c

+8 −8
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ static void sfp_sm_next(struct sfp *sfp, unsigned int state, 
	sfp_sm_set_timer(sfp, timeout);

}



static void sfp_sm_ins_next(struct sfp *sfp, unsigned int state,

static void sfp_sm_mod_next(struct sfp *sfp, unsigned int state,

			    unsigned int timeout)

{

	sfp->sm_mod_state = state;
@@ -1569,22 +1569,22 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event) 
	default:

		if (event == SFP_E_INSERT && sfp->attached) {

			sfp_module_tx_disable(sfp);

			sfp_sm_ins_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT);

			sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT);

		}

		break;



	case SFP_MOD_PROBE:

		if (event == SFP_E_REMOVE) {

			sfp_sm_ins_next(sfp, SFP_MOD_EMPTY, 0);

			sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);

		} else if (event == SFP_E_TIMEOUT) {

			int val = sfp_sm_mod_probe(sfp);



			if (val == 0)

				sfp_sm_ins_next(sfp, SFP_MOD_PRESENT, 0);

				sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0);

			else if (val > 0)

				sfp_sm_ins_next(sfp, SFP_MOD_HPOWER, val);

				sfp_sm_mod_next(sfp, SFP_MOD_HPOWER, val);

			else if (val != -EAGAIN)

				sfp_sm_ins_next(sfp, SFP_MOD_ERROR, 0);

				sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0);

			else

				sfp_sm_set_timer(sfp, T_PROBE_RETRY);

		}
@@ -1592,7 +1592,7 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event) 


	case SFP_MOD_HPOWER:

		if (event == SFP_E_TIMEOUT) {

			sfp_sm_ins_next(sfp, SFP_MOD_PRESENT, 0);

			sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0);

			break;

		}

		/* fallthrough */
@@ -1600,7 +1600,7 @@ static void sfp_sm_module(struct sfp *sfp, unsigned int event) 
	case SFP_MOD_ERROR:

		if (event == SFP_E_REMOVE) {

			sfp_sm_mod_remove(sfp);

			sfp_sm_ins_next(sfp, SFP_MOD_EMPTY, 0);

			sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);

		}

		break;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE