target/linux/generic/backport-5.4/722-v5.5-net-sfp-rename-sfp_sm_ins_next-as-sfp_sm_mod_next.patch

   1 From f2a1ccfc4ad4f97c98c3cc18eb32992151ce089a Mon Sep 17 00:00:00 2001
   2 From: Russell King <rmk+kernel@armlinux.org.uk>
   3 Date: Fri, 11 Oct 2019 22:27:21 +0100
   4 Subject: [PATCH 620/660] net: sfp: rename sfp_sm_ins_next() as
   5  sfp_sm_mod_next()
   6
   7 sfp_sm_ins_next() modifies the module state machine.  Change it's name
   8 to reflect this.
   9
  10 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  11 ---
  12  drivers/net/phy/sfp.c | 16 ++++++++--------
  13  1 file changed, 8 insertions(+), 8 deletions(-)
  14
  15 --- a/drivers/net/phy/sfp.c
  16 +++ b/drivers/net/phy/sfp.c
  17 @@ -1245,7 +1245,7 @@ static void sfp_sm_next(struct sfp *sfp,
  18         sfp_sm_set_timer(sfp, timeout);
  19  }
  20
  21 -static void sfp_sm_ins_next(struct sfp *sfp, unsigned int state,
  22 +static void sfp_sm_mod_next(struct sfp *sfp, unsigned int state,
  23                             unsigned int timeout)
  24  {
  25         sfp->sm_mod_state = state;
  26 @@ -1569,22 +1569,22 @@ static void sfp_sm_module(struct sfp *sf
  27         default:
  28                 if (event == SFP_E_INSERT && sfp->attached) {
  29                         sfp_module_tx_disable(sfp);
  30 -                       sfp_sm_ins_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT);
  31 +                       sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_PROBE_INIT);
  32                 }
  33                 break;
  34
  35         case SFP_MOD_PROBE:
  36                 if (event == SFP_E_REMOVE) {
  37 -                       sfp_sm_ins_next(sfp, SFP_MOD_EMPTY, 0);
  38 +                       sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);
  39                 } else if (event == SFP_E_TIMEOUT) {
  40                         int val = sfp_sm_mod_probe(sfp);
  41
  42                         if (val == 0)
  43 -                               sfp_sm_ins_next(sfp, SFP_MOD_PRESENT, 0);
  44 +                               sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0);
  45                         else if (val > 0)
  46 -                               sfp_sm_ins_next(sfp, SFP_MOD_HPOWER, val);
  47 +                               sfp_sm_mod_next(sfp, SFP_MOD_HPOWER, val);
  48                         else if (val != -EAGAIN)
  49 -                               sfp_sm_ins_next(sfp, SFP_MOD_ERROR, 0);
  50 +                               sfp_sm_mod_next(sfp, SFP_MOD_ERROR, 0);
  51                         else
  52                                 sfp_sm_set_timer(sfp, T_PROBE_RETRY);
  53                 }
  54 @@ -1592,7 +1592,7 @@ static void sfp_sm_module(struct sfp *sf
  55
  56         case SFP_MOD_HPOWER:
  57                 if (event == SFP_E_TIMEOUT) {
  58 -                       sfp_sm_ins_next(sfp, SFP_MOD_PRESENT, 0);
  59 +                       sfp_sm_mod_next(sfp, SFP_MOD_PRESENT, 0);
  60                         break;
  61                 }
  62                 /* fallthrough */
  63 @@ -1600,7 +1600,7 @@ static void sfp_sm_module(struct sfp *sf
  64         case SFP_MOD_ERROR:
  65                 if (event == SFP_E_REMOVE) {
  66                         sfp_sm_mod_remove(sfp);
  67 -                       sfp_sm_ins_next(sfp, SFP_MOD_EMPTY, 0);
  68 +                       sfp_sm_mod_next(sfp, SFP_MOD_EMPTY, 0);
  69                 }
  70                 break;
  71         }