releases/6.6.26/i40e-remove-_t-suffix-from-enum-type-names.patch

   1 From e19cafc82b790ad7484491bab57128e100dfdc91 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Mon, 13 Nov 2023 15:10:24 -0800
   4 Subject: i40e: Remove _t suffix from enum type names
   5
   6 From: Ivan Vecera <ivecera@redhat.com>
   7
   8 [ Upstream commit addca9175e5f74cf29e8ad918c38c09b8663b5b8 ]
   9
  10 Enum type names should not be suffixed by '_t'. Either to use
  11 'typedef enum name name_t' to so plain 'name_t var' instead of
  12 'enum name_t var'.
  13
  14 Signed-off-by: Ivan Vecera <ivecera@redhat.com>
  15 Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
  16 Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
  17 Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
  18 Link: https://lore.kernel.org/r/20231113231047.548659-6-anthony.l.nguyen@intel.com
  19 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  20 Stable-dep-of: ea558de7238b ("i40e: Enforce software interrupt during busy-poll exit")
  21 Signed-off-by: Sasha Levin <sashal@kernel.org>
  22 ---
  23  drivers/net/ethernet/intel/i40e/i40e.h      | 4 ++--
  24  drivers/net/ethernet/intel/i40e/i40e_ptp.c  | 6 +++---
  25  drivers/net/ethernet/intel/i40e/i40e_txrx.h | 4 ++--
  26  3 files changed, 7 insertions(+), 7 deletions(-)
  27
  28 diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
  29 index 55bb0b5310d5b..bc353da3ed41d 100644
  30 --- a/drivers/net/ethernet/intel/i40e/i40e.h
  31 +++ b/drivers/net/ethernet/intel/i40e/i40e.h
  32 @@ -108,7 +108,7 @@
  33  #define I40E_MAX_BW_INACTIVE_ACCUM     4 /* accumulate 4 credits max */
  34
  35  /* driver state flags */
  36 -enum i40e_state_t {
  37 +enum i40e_state {
  38         __I40E_TESTING,
  39         __I40E_CONFIG_BUSY,
  40         __I40E_CONFIG_DONE,
  41 @@ -156,7 +156,7 @@ enum i40e_state_t {
  42         BIT_ULL(__I40E_PF_RESET_AND_REBUILD_REQUESTED)
  43
  44  /* VSI state flags */
  45 -enum i40e_vsi_state_t {
  46 +enum i40e_vsi_state {
  47         __I40E_VSI_DOWN,
  48         __I40E_VSI_NEEDS_RESTART,
  49         __I40E_VSI_SYNCING_FILTERS,
  50 diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
  51 index 8a26811140b47..cac9584debb1d 100644
  52 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
  53 +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
  54 @@ -34,7 +34,7 @@ enum i40e_ptp_pin {
  55         GPIO_4
  56  };
  57
  58 -enum i40e_can_set_pins_t {
  59 +enum i40e_can_set_pins {
  60         CANT_DO_PINS = -1,
  61         CAN_SET_PINS,
  62         CAN_DO_PINS
  63 @@ -192,7 +192,7 @@ static bool i40e_is_ptp_pin_dev(struct i40e_hw *hw)
  64   * return CAN_DO_PINS if pins can be manipulated within a NIC or
  65   * return CANT_DO_PINS otherwise.
  66   **/
  67 -static enum i40e_can_set_pins_t i40e_can_set_pins(struct i40e_pf *pf)
  68 +static enum i40e_can_set_pins i40e_can_set_pins(struct i40e_pf *pf)
  69  {
  70         if (!i40e_is_ptp_pin_dev(&pf->hw)) {
  71                 dev_warn(&pf->pdev->dev,
  72 @@ -1070,7 +1070,7 @@ static void i40e_ptp_set_pins_hw(struct i40e_pf *pf)
  73  static int i40e_ptp_set_pins(struct i40e_pf *pf,
  74                              struct i40e_ptp_pins_settings *pins)
  75  {
  76 -       enum i40e_can_set_pins_t pin_caps = i40e_can_set_pins(pf);
  77 +       enum i40e_can_set_pins pin_caps = i40e_can_set_pins(pf);
  78         int i = 0;
  79
  80         if (pin_caps == CANT_DO_PINS)
  81 diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
  82 index 900b0d9ede9f5..84e4dacde6f58 100644
  83 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
  84 +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
  85 @@ -57,7 +57,7 @@ static inline u16 i40e_intrl_usec_to_reg(int intrl)
  86   * mentioning ITR_INDX, ITR_NONE cannot be used as an index 'n' into any
  87   * register but instead is a special value meaning "don't update" ITR0/1/2.
  88   */
  89 -enum i40e_dyn_idx_t {
  90 +enum i40e_dyn_idx {
  91         I40E_IDX_ITR0 = 0,
  92         I40E_IDX_ITR1 = 1,
  93         I40E_IDX_ITR2 = 2,
  94 @@ -305,7 +305,7 @@ struct i40e_rx_queue_stats {
  95         u64 page_busy_count;
  96  };
  97
  98 -enum i40e_ring_state_t {
  99 +enum i40e_ring_state {
 100         __I40E_TX_FDIR_INIT_DONE,
 101         __I40E_TX_XPS_INIT_DONE,
 102         __I40E_RING_STATE_NBITS /* must be last */
 103 --
 104 2.43.0
 105