> +static int aq_ethtool_get_eee(struct net_device *ndev, struct ethtool_eee > *eee) > +{ > + struct aq_nic_s *aq_nic = netdev_priv(ndev); > + int err = 0; > + > + u32 rate, supported_rates;
Please keep all local variables together and sort them as reverse christmas tree. This should apply to all new code you are adding. > index 3c94cff..a021dc4 100644 > --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h > +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h > @@ -62,12 +62,6 @@ > #define HW_ATL_A0_MPI_SPEED_MSK 0xFFFFU > #define HW_ATL_A0_MPI_SPEED_SHIFT 16U > > -#define HW_ATL_A0_RATE_10G BIT(0) > -#define HW_ATL_A0_RATE_5G BIT(1) > -#define HW_ATL_A0_RATE_2G5 BIT(3) > -#define HW_ATL_A0_RATE_1G BIT(4) > -#define HW_ATL_A0_RATE_100M BIT(5) > - > #define HW_ATL_A0_TXBUF_MAX 160U > #define HW_ATL_A0_RXBUF_MAX 320U > > diff --git > a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c > b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c > index 0ad6ac5..7bd1bea 100644 > --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c > +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c > @@ -40,6 +40,11 @@ > #define HW_ATL_FW2X_CTRL_ASYMMETRIC_PAUSE BIT(CTRL_ASYMMETRIC_PAUSE) > #define HW_ATL_FW2X_CTRL_FORCE_RECONNECT BIT(CTRL_FORCE_RECONNECT) > > +#define HW_ATL_FW2X_CAP_EEE_1G_MASK BIT(CAPS_HI_1000BASET_FD_EEE) > +#define HW_ATL_FW2X_CAP_EEE_2G5_MASK BIT(CAPS_HI_2P5GBASET_FD_EEE) > +#define HW_ATL_FW2X_CAP_EEE_5G_MASK BIT(CAPS_HI_5GBASET_FD_EEE) > +#define HW_ATL_FW2X_CAP_EEE_10G_MASK BIT(CAPS_HI_10GBASET_FD_EEE) Please do this rename as a separate patch, so we can clearly see new EEE code which needs close review, from the simple renaming which needs little review. In general, it is better to have lots of simple patches, which do just one things, rather than a big patch making lots of unrelated changes. Andrew