ice: Use bitfields when possible

We can use bit fields to store boolean values and when the
bit fields are next to each other, the compiler will combine them
(as long as the size holds enough).

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 7958f2b..23e30a6 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -277,10 +277,10 @@ struct ice_vsi {
        struct list_head tmp_sync_list;         /* MAC filters to be synced */
        struct list_head tmp_unsync_list;       /* MAC filters to be unsynced */
 
-       u8 irqs_ready;
-       u8 current_isup;                 /* Sync 'link up' logging */
-       u8 stat_offsets_loaded;
-       u8 vlan_ena;
+       u8 irqs_ready:1;
+       u8 current_isup:1;               /* Sync 'link up' logging */
+       u8 stat_offsets_loaded:1;
+       u8 vlan_ena:1;
 
        /* queue information */
        u8 tx_mapping_mode;              /* ICE_MAP_MODE_[CONTIG|SCATTER] */
@@ -384,7 +384,7 @@ struct ice_pf {
        struct ice_hw_port_stats stats;
        struct ice_hw_port_stats stats_prev;
        struct ice_hw hw;
-       u8 stat_prev_loaded;    /* has previous stats been loaded */
+       u8 stat_prev_loaded:1; /* has previous stats been loaded */
 #ifdef CONFIG_DCB
        u16 dcbx_cap;
 #endif /* CONFIG_DCB */

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h
index 4cff52f..ec76aba 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.h
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h
@@ -166,7 +166,7 @@ struct ice_ring {
        u16 q_index;                    /* Queue number of ring */
        u16 q_handle;                   /* Queue handle per TC */
 
-       u8 ring_active;                 /* is ring online or not */
+       u8 ring_active:1;               /* is ring online or not */
 
        u16 count;                      /* Number of descriptors */
        u16 reg_idx;                    /* HW register index of the ring */

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
index 3725aea..60f024a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
@@ -55,8 +55,8 @@ struct ice_vf {
        struct virtchnl_version_info vf_ver;
        struct virtchnl_ether_addr dflt_lan_addr;
        u16 port_vlan_id;
-       u8 pf_set_mac;                  /* VF MAC address set by VMM admin */
-       u8 trusted;
+       u8 pf_set_mac:1;                /* VF MAC address set by VMM admin */
+       u8 trusted:1;
        u16 lan_vsi_idx;                /* index into PF struct */
        u16 lan_vsi_num;                /* ID as used by firmware */
        u64 num_mdd_events;             /* number of MDD events detected */
@@ -65,9 +65,9 @@ struct ice_vf {
        unsigned long vf_caps;          /* VF's adv. capabilities */
        DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */
        unsigned int tx_rate;           /* Tx bandwidth limit in Mbps */
-       u8 link_forced;
-       u8 link_up;                     /* only valid if VF link is forced */
-       u8 spoofchk;
+       u8 link_forced:1;
+       u8 link_up:1;                   /* only valid if VF link is forced */
+       u8 spoofchk:1;
        u16 num_mac;
        u16 num_vlan;
        u16 num_vf_qs;                  /* num of queue configured per VF */