OSDN Git Service

ice: fix use of deprecated strlcpy()
authorBruce Allan <bruce.w.allan@intel.com>
Thu, 27 Feb 2020 18:15:01 +0000 (10:15 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 10 Mar 2020 20:10:42 +0000 (13:10 -0700)
checkpatch complains "CHECK:DEPRECATED_API: Deprecated use of 'strlcpy',
prefer 'stracpy or strscpy' instead"; use strscpy.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_ethtool.c

index 03d4ecf..e3d148f 100644 (file)
@@ -173,8 +173,8 @@ ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
        struct ice_hw *hw = &pf->hw;
        u16 oem_build;
 
-       strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
-       strlcpy(drvinfo->version, ice_drv_ver, sizeof(drvinfo->version));
+       strscpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
+       strscpy(drvinfo->version, ice_drv_ver, sizeof(drvinfo->version));
 
        /* Display NVM version (from which the firmware version can be
         * determined) which contains more pertinent information.
@@ -185,7 +185,7 @@ ice_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
                 "%x.%02x 0x%x %d.%d.%d", nvm_ver_hi, nvm_ver_lo,
                 hw->nvm.eetrack, oem_ver, oem_build, oem_patch);
 
-       strlcpy(drvinfo->bus_info, pci_name(pf->pdev),
+       strscpy(drvinfo->bus_info, pci_name(pf->pdev),
                sizeof(drvinfo->bus_info));
        drvinfo->n_priv_flags = ICE_PRIV_FLAG_ARRAY_SIZE;
 }