Commit 8ac72d16 authored by Rick Jones's avatar Rick Jones Committed by David S. Miller

corral some wayward N/A fw_version dust bunnies

Round-up some wayward "N/A" fw_version dust bunnies as part of that
clean-up.
Signed-off-by: default avatarRick Jones <rick.jones2@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b5a5c0d
...@@ -5393,7 +5393,6 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev, ...@@ -5393,7 +5393,6 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev,
strlcpy(info->driver, s2io_driver_name, sizeof(info->driver)); strlcpy(info->driver, s2io_driver_name, sizeof(info->driver));
strlcpy(info->version, s2io_driver_version, sizeof(info->version)); strlcpy(info->version, s2io_driver_version, sizeof(info->version));
strlcpy(info->fw_version, "", sizeof(info->fw_version));
strlcpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info)); strlcpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info));
info->regdump_len = XENA_REG_SPACE; info->regdump_len = XENA_REG_SPACE;
info->eedump_len = XENA_EEPROM_SPACE; info->eedump_len = XENA_EEPROM_SPACE;
......
...@@ -1405,8 +1405,9 @@ static void rtl8169_get_drvinfo(struct net_device *dev, ...@@ -1405,8 +1405,9 @@ static void rtl8169_get_drvinfo(struct net_device *dev,
strlcpy(info->version, RTL8169_VERSION, sizeof(info->version)); strlcpy(info->version, RTL8169_VERSION, sizeof(info->version));
strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info)); strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info));
BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version)); BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version));
strlcpy(info->fw_version, IS_ERR_OR_NULL(rtl_fw) ? "N/A" : if (!IS_ERR_OR_NULL(rtl_fw))
rtl_fw->version, sizeof(info->fw_version)); strlcpy(info->fw_version, rtl_fw->version,
sizeof(info->fw_version));
} }
static int rtl8169_get_regs_len(struct net_device *dev) static int rtl8169_get_regs_len(struct net_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment