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

r8169: use KBUILD_MODNAME instead of own module name definition

Remove own module name definition and use KBUILD_MODNAME instead.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Heiner Kallweit and committed by
David S. Miller
7cb7541a 58fee5fc

+3 -5
+3 -5
drivers/net/ethernet/realtek/r8169_main.c
··· 34 34 #include "r8169.h" 35 35 #include "r8169_firmware.h" 36 36 37 - #define MODULENAME "r8169" 38 - 39 37 #define FIRMWARE_8168D_1 "rtl_nic/rtl8168d-1.fw" 40 38 #define FIRMWARE_8168D_2 "rtl_nic/rtl8168d-2.fw" 41 39 #define FIRMWARE_8168E_1 "rtl_nic/rtl8168e-1.fw" ··· 1452 1454 struct rtl8169_private *tp = netdev_priv(dev); 1453 1455 struct rtl_fw *rtl_fw = tp->rtl_fw; 1454 1456 1455 - strlcpy(info->driver, MODULENAME, sizeof(info->driver)); 1457 + strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver)); 1456 1458 strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info)); 1457 1459 BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version)); 1458 1460 if (rtl_fw) ··· 5303 5305 return -ENODEV; 5304 5306 } 5305 5307 5306 - rc = pcim_iomap_regions(pdev, BIT(region), MODULENAME); 5308 + rc = pcim_iomap_regions(pdev, BIT(region), KBUILD_MODNAME); 5307 5309 if (rc < 0) { 5308 5310 dev_err(&pdev->dev, "cannot remap MMIO, aborting\n"); 5309 5311 return rc; ··· 5438 5440 } 5439 5441 5440 5442 static struct pci_driver rtl8169_pci_driver = { 5441 - .name = MODULENAME, 5443 + .name = KBUILD_MODNAME, 5442 5444 .id_table = rtl8169_pci_tbl, 5443 5445 .probe = rtl_init_one, 5444 5446 .remove = rtl_remove_one,