ice: Rename a couple of variables

In ice_set_link_ksettings, change 'abilities' to 'phy_caps' and 'p' to
'pi'. This is more consistent with similar usages elsewhere in the
driver.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index c8a8fda..a31b6cf 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -2196,12 +2196,12 @@ ice_set_link_ksettings(struct net_device *netdev,
 {
        struct ice_netdev_priv *np = netdev_priv(netdev);
        struct ethtool_link_ksettings safe_ks, copy_ks;
-       struct ice_aqc_get_phy_caps_data *abilities;
        u8 autoneg, timeout = TEST_SET_BITS_TIMEOUT;
+       struct ice_aqc_get_phy_caps_data *phy_caps;
        struct ice_aqc_set_phy_cfg_data config;
        u16 adv_link_speed, curr_link_speed;
        struct ice_pf *pf = np->vsi->back;
-       struct ice_port_info *p;
+       struct ice_port_info *pi;
        u8 autoneg_changed = 0;
        enum ice_status status;
        u64 phy_type_high = 0;
@@ -2209,25 +2209,25 @@ ice_set_link_ksettings(struct net_device *netdev,
        int err = 0;
        bool linkup;
 
-       p = np->vsi->port_info;
+       pi = np->vsi->port_info;
 
-       if (!p)
+       if (!pi)
                return -EOPNOTSUPP;
 
-       if (p->phy.media_type != ICE_MEDIA_BASET &&
-           p->phy.media_type != ICE_MEDIA_FIBER &&
-           p->phy.media_type != ICE_MEDIA_BACKPLANE &&
-           p->phy.media_type != ICE_MEDIA_DA &&
-           p->phy.link_info.link_info & ICE_AQ_LINK_UP)
+       if (pi->phy.media_type != ICE_MEDIA_BASET &&
+           pi->phy.media_type != ICE_MEDIA_FIBER &&
+           pi->phy.media_type != ICE_MEDIA_BACKPLANE &&
+           pi->phy.media_type != ICE_MEDIA_DA &&
+           pi->phy.link_info.link_info & ICE_AQ_LINK_UP)
                return -EOPNOTSUPP;
 
-       abilities = kzalloc(sizeof(*abilities), GFP_KERNEL);
-       if (!abilities)
+       phy_caps = kzalloc(sizeof(*phy_caps), GFP_KERNEL);
+       if (!phy_caps)
                return -ENOMEM;
 
        /* Get the PHY capabilities based on media */
-       status = ice_aq_get_phy_caps(p, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
-                                    abilities, NULL);
+       status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_TOPO_CAP_MEDIA,
+                                    phy_caps, NULL);
        if (status) {
                err = -EAGAIN;
                goto done;
@@ -2289,26 +2289,26 @@ ice_set_link_ksettings(struct net_device *netdev,
         * configuration is initialized during probe from PHY capabilities
         * software mode, and updated on set PHY configuration.
         */
-       memcpy(&config, &p->phy.curr_user_phy_cfg, sizeof(config));
+       memcpy(&config, &pi->phy.curr_user_phy_cfg, sizeof(config));
 
        config.caps |= ICE_AQ_PHY_ENA_AUTO_LINK_UPDT;
 
        /* Check autoneg */
-       err = ice_setup_autoneg(p, &safe_ks, &config, autoneg, &autoneg_changed,
+       err = ice_setup_autoneg(pi, &safe_ks, &config, autoneg, &autoneg_changed,
                                netdev);
 
        if (err)
                goto done;
 
        /* Call to get the current link speed */
-       p->phy.get_link_info = true;
-       status = ice_get_link_status(p, &linkup);
+       pi->phy.get_link_info = true;
+       status = ice_get_link_status(pi, &linkup);
        if (status) {
                err = -EAGAIN;
                goto done;
        }
 
-       curr_link_speed = p->phy.link_info.link_speed;
+       curr_link_speed = pi->phy.link_info.link_speed;
        adv_link_speed = ice_ksettings_find_adv_link_speed(ks);
 
        /* If speed didn't get set, set it to what it currently is.
@@ -2327,7 +2327,7 @@ ice_set_link_ksettings(struct net_device *netdev,
        }
 
        /* save the requested speeds */
-       p->phy.link_info.req_speeds = adv_link_speed;
+       pi->phy.link_info.req_speeds = adv_link_speed;
 
        /* set link and auto negotiation so changes take effect */
        config.caps |= ICE_AQ_PHY_ENA_LINK;
@@ -2343,9 +2343,9 @@ ice_set_link_ksettings(struct net_device *netdev,
         * for set PHY configuration
         */
        config.phy_type_high = cpu_to_le64(phy_type_high) &
-                       abilities->phy_type_high;
+                       phy_caps->phy_type_high;
        config.phy_type_low = cpu_to_le64(phy_type_low) &
-                       abilities->phy_type_low;
+                       phy_caps->phy_type_low;
 
        if (!(config.phy_type_high || config.phy_type_low)) {
                /* If there is no intersection and lenient mode is enabled, then
@@ -2365,7 +2365,7 @@ ice_set_link_ksettings(struct net_device *netdev,
        }
 
        /* If link is up put link down */
-       if (p->phy.link_info.link_info & ICE_AQ_LINK_UP) {
+       if (pi->phy.link_info.link_info & ICE_AQ_LINK_UP) {
                /* Tell the OS link is going down, the link will go
                 * back up when fw says it is ready asynchronously
                 */
@@ -2375,7 +2375,7 @@ ice_set_link_ksettings(struct net_device *netdev,
        }
 
        /* make the aq call */
-       status = ice_aq_set_phy_cfg(&pf->hw, p, &config, NULL);
+       status = ice_aq_set_phy_cfg(&pf->hw, pi, &config, NULL);
        if (status) {
                netdev_info(netdev, "Set phy config failed,\n");
                err = -EAGAIN;
@@ -2383,9 +2383,9 @@ ice_set_link_ksettings(struct net_device *netdev,
        }
 
        /* Save speed request */
-       p->phy.curr_user_speed_req = adv_link_speed;
+       pi->phy.curr_user_speed_req = adv_link_speed;
 done:
-       kfree(abilities);
+       kfree(phy_caps);
        clear_bit(__ICE_CFG_BUSY, pf->state);
 
        return err;