Commit 7cb7541a authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: use KBUILD_MODNAME instead of own module name definition 



Remove own module name definition and use KBUILD_MODNAME instead.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58fee5fc

drivers/net/ethernet/realtek/r8169_main.c

+3 −5
Original line number Diff line number Diff line
@@ -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,