* [PATCH net-next] corral some wayward N/A fw_version dust bunnies
@ 2011-11-23 0:06 Rick Jones
2011-11-29 6:18 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Rick Jones @ 2011-11-23 0:06 UTC (permalink / raw)
To: netdev, Francois Romieu, Jon Mason
From: Rick Jones <rick.jones2@hp.com>
Round-up some wayward "N/A" fw_version dust bunnies as part of that
clean-up.
Signed-off-by: Rick Jones <rick.jones2@hp.com>
---
Compiled only.
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index 76ae476..97f63e1 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -5393,7 +5393,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;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index f7bc310..e5a6d8e 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1405,8 +1405,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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] corral some wayward N/A fw_version dust bunnies
2011-11-23 0:06 [PATCH net-next] corral some wayward N/A fw_version dust bunnies Rick Jones
@ 2011-11-29 6:18 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-11-29 6:18 UTC (permalink / raw)
To: raj; +Cc: netdev, romieu, jdmason
From: raj@tardy.cup.hp.com (Rick Jones)
Date: Tue, 22 Nov 2011 16:06:26 -0800 (PST)
> From: Rick Jones <rick.jones2@hp.com>
>
> Round-up some wayward "N/A" fw_version dust bunnies as part of that
> clean-up.
>
> Signed-off-by: Rick Jones <rick.jones2@hp.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-29 6:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-23 0:06 [PATCH net-next] corral some wayward N/A fw_version dust bunnies Rick Jones
2011-11-29 6:18 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).