corral some wayward N/A fw_version dust bunnies

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Rick Jones and committed by

David S. Miller 14 years ago 8ac72d16 6b5a5c0d

+3 -3

2 changed files

expand all

drivers

net

ethernet

neterion

s2io.c

realtek

r8169.c

-1

drivers/net/ethernet/neterion/s2io.c

··· 5393 5393 5394 5394 strlcpy(info->driver, s2io_driver_name, sizeof(info->driver)); 5395 5395 strlcpy(info->version, s2io_driver_version, sizeof(info->version)); 5396 - strlcpy(info->fw_version, "", sizeof(info->fw_version)); 5397 5396 strlcpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info)); 5398 5397 info->regdump_len = XENA_REG_SPACE; 5399 5398 info->eedump_len = XENA_EEPROM_SPACE;

+3 -2

drivers/net/ethernet/realtek/r8169.c

··· 1405 1405 strlcpy(info->version, RTL8169_VERSION, sizeof(info->version)); 1406 1406 strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info)); 1407 1407 BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version)); 1408 - strlcpy(info->fw_version, IS_ERR_OR_NULL(rtl_fw) ? "N/A" : 1409 - rtl_fw->version, sizeof(info->fw_version)); 1408 + if (!IS_ERR_OR_NULL(rtl_fw)) 1409 + strlcpy(info->fw_version, rtl_fw->version, 1410 + sizeof(info->fw_version)); 1410 1411 } 1411 1412 1412 1413 static int rtl8169_get_regs_len(struct net_device *dev)