]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
r8169: use KBUILD_MODNAME instead of own module name definition
authorHeiner Kallweit <hkallweit1@gmail.com>
Sat, 15 May 2021 11:53:21 +0000 (13:53 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 May 2021 21:00:52 +0000 (14:00 -0700)
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>
drivers/net/ethernet/realtek/r8169_main.c

index 2c89cde7da1e6e8aef9a4d07fca180a2dc1afc51..1663e0486496e469589c20bddf7685c2e211581b 100644 (file)
@@ -34,8 +34,6 @@
 #include "r8169.h"
 #include "r8169_firmware.h"
 
-#define MODULENAME "r8169"
-
 #define FIRMWARE_8168D_1       "rtl_nic/rtl8168d-1.fw"
 #define FIRMWARE_8168D_2       "rtl_nic/rtl8168d-2.fw"
 #define FIRMWARE_8168E_1       "rtl_nic/rtl8168e-1.fw"
@@ -1454,7 +1452,7 @@ static void rtl8169_get_drvinfo(struct net_device *dev,
        struct rtl8169_private *tp = netdev_priv(dev);
        struct rtl_fw *rtl_fw = tp->rtl_fw;
 
-       strlcpy(info->driver, MODULENAME, sizeof(info->driver));
+       strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
        strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info));
        BUILD_BUG_ON(sizeof(info->fw_version) < sizeof(rtl_fw->version));
        if (rtl_fw)
@@ -5305,7 +5303,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                return -ENODEV;
        }
 
-       rc = pcim_iomap_regions(pdev, BIT(region), MODULENAME);
+       rc = pcim_iomap_regions(pdev, BIT(region), KBUILD_MODNAME);
        if (rc < 0) {
                dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
                return rc;
@@ -5440,7 +5438,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 }
 
 static struct pci_driver rtl8169_pci_driver = {
-       .name           = MODULENAME,
+       .name           = KBUILD_MODNAME,
        .id_table       = rtl8169_pci_tbl,
        .probe          = rtl_init_one,
        .remove         = rtl_remove_one,