ice: Replace some memsets and memcpys with assignment

In ice_set_link_ksettings, use assignment instead of memset/memcpy
where possible

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 41795d263dcde6d35371171f5c3cebc806f5805f..5dd84ccf67567fee8f2046a284183d3302584372 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -2195,8 +2195,9 @@ ice_set_link_ksettings(struct net_device *netdev,
                       const struct ethtool_link_ksettings *ks)
 {
        struct ice_netdev_priv *np = netdev_priv(netdev);
-       struct ethtool_link_ksettings safe_ks, copy_ks;
        u8 autoneg, timeout = TEST_SET_BITS_TIMEOUT;
+       struct ethtool_link_ksettings copy_ks = *ks;
+       struct ethtool_link_ksettings safe_ks = {};
        struct ice_aqc_get_phy_caps_data *phy_caps;
        struct ice_aqc_set_phy_cfg_data config;
        u16 adv_link_speed, curr_link_speed;
@@ -2233,14 +2234,9 @@ ice_set_link_ksettings(struct net_device *netdev,
                goto done;
        }
 
-       /* copy the ksettings to copy_ks to avoid modifying the original */
-       memcpy(&copy_ks, ks, sizeof(copy_ks));
-
        /* save autoneg out of ksettings */
        autoneg = copy_ks.base.autoneg;
 
-       memset(&safe_ks, 0, sizeof(safe_ks));
-
        /* Get link modes supported by hardware.*/
        ice_phy_type_to_ethtool(netdev, &safe_ks);
 
@@ -2289,7 +2285,7 @@ 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, &pi->phy.curr_user_phy_cfg, sizeof(config));
+       config = pi->phy.curr_user_phy_cfg;
 
        config.caps |= ICE_AQ_PHY_ENA_AUTO_LINK_UPDT;