hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

r8169: switch to device-managed functions in probe (part 2) 

This is a follow up to the commit

  4c45d24a75 ("r8169: switch to device-managed functions in probe")

to move towards managed resources even more.

Cc: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy Shevchenko 2018-03-01 13:27:35 +02:00 committed by David S. Miller
parent 1ef7286e7f
commit 93a00d4d61
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/realtek/r8169.c
View File

@ -8169,7 +8169,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
struct rtl8169_private *tp; struct rtl8169_private *tp;
struct mii_if_info *mii; struct mii_if_info *mii;
struct net_device *dev; struct net_device *dev;
void __iomem *ioaddr;
int chipset, i; int chipset, i;
int rc; int rc;
@ -8227,20 +8226,13 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
return -ENODEV; return -ENODEV;
} }
rc = pci_request_regions(pdev, MODULENAME); rc = pcim_iomap_regions(pdev, BIT(region), MODULENAME);
if (rc < 0) { if (rc < 0) {
netif_err(tp, probe, dev, "could not request regions\n"); netif_err(tp, probe, dev, "cannot remap MMIO, aborting\n");
return rc; return rc;
} }
/* ioremap MMIO region */ tp->mmio_addr = pcim_iomap_table(pdev)[region];
ioaddr = devm_ioremap(&pdev->dev, pci_resource_start(pdev, region),
R8169_REGS_SIZE);
if (!ioaddr) {
netif_err(tp, probe, dev, "cannot remap MMIO, aborting\n");
return -EIO;
}
tp->mmio_addr = ioaddr;
if (!pci_is_pcie(pdev)) if (!pci_is_pcie(pdev))
netif_info(tp, probe, dev, "not PCI Express\n"); netif_info(tp, probe, dev, "not PCI Express\n");
@ -8412,7 +8404,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n", netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",
rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr, rtl_chip_infos[chipset].name, tp->mmio_addr, dev->dev_addr,
(u32)(RTL_R32(tp, TxConfig) & 0x9cf0f8ff), (u32)(RTL_R32(tp, TxConfig) & 0x9cf0f8ff),
pci_irq_vector(pdev, 0)); pci_irq_vector(pdev, 0));
if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) { if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) {