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.

(cherry picked from commit 8ac72d167198f52cba8637cc9bec89339b8e4e64)
Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a424c37047393f79bf9c16bf8164440434f21da6..4c44ce29f22cb74a21ff4199094012129a906f5d 100644 (file)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1404,8 +1404,9 @@ static void rtl8169_get_drvinfo(struct net_device *dev,
        strlcpy(info->version, RTL8169_VERSION, sizeof(info->version));
        strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info));
        BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version));
-       strlcpy(info->fw_version, IS_ERR_OR_NULL(rtl_fw) ? "N/A" :
-              rtl_fw->version, sizeof(info->fw_version));
+       if (!IS_ERR_OR_NULL(rtl_fw))
+               strlcpy(info->fw_version, rtl_fw->version,
+                       sizeof(info->fw_version));
 }
 
 static int rtl8169_get_regs_len(struct net_device *dev)

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index c420562df7a7bab789feb29763bfacca4951c210..c138d086640192d69fa2aed5ebe717a18e3823d5 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -5445,7 +5445,6 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev,
 
        strlcpy(info->driver, s2io_driver_name, sizeof(info->driver));
        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));
        info->regdump_len = XENA_REG_SPACE;
        info->eedump_len = XENA_EEPROM_SPACE;