|
@@ -5634,7 +5634,7 @@ static int rtl8169_close(struct net_device *dev)
|
|
|
rtl8169_down(dev);
|
|
|
rtl_unlock_work(tp);
|
|
|
|
|
|
- free_irq(dev->irq, dev);
|
|
|
+ free_irq(pdev->irq, dev);
|
|
|
|
|
|
dma_free_coherent(&pdev->dev, R8169_RX_RING_BYTES, tp->RxDescArray,
|
|
|
tp->RxPhyAddr);
|
|
@@ -5690,7 +5690,7 @@ static int rtl_open(struct net_device *dev)
|
|
|
|
|
|
rtl_request_firmware(tp);
|
|
|
|
|
|
- retval = request_irq(dev->irq, rtl8169_interrupt,
|
|
|
+ retval = request_irq(pdev->irq, rtl8169_interrupt,
|
|
|
(tp->features & RTL_FEATURE_MSI) ? 0 : IRQF_SHARED,
|
|
|
dev->name, dev);
|
|
|
if (retval < 0)
|
|
@@ -6215,8 +6215,6 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
|
|
|
SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
|
|
|
dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
|
|
|
- dev->irq = pdev->irq;
|
|
|
- dev->base_addr = (unsigned long) ioaddr;
|
|
|
|
|
|
netif_napi_add(dev, &tp->napi, rtl8169_poll, R8169_NAPI_WEIGHT);
|
|
|
|
|
@@ -6255,9 +6253,9 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
|
|
|
pci_set_drvdata(pdev, dev);
|
|
|
|
|
|
- netif_info(tp, probe, dev, "%s at 0x%lx, %pM, XID %08x IRQ %d\n",
|
|
|
- rtl_chip_infos[chipset].name, dev->base_addr, dev->dev_addr,
|
|
|
- (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), dev->irq);
|
|
|
+ netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n",
|
|
|
+ rtl_chip_infos[chipset].name, ioaddr, dev->dev_addr,
|
|
|
+ (u32)(RTL_R32(TxConfig) & 0x9cf0f8ff), pdev->irq);
|
|
|
if (rtl_chip_infos[chipset].jumbo_max != JUMBO_1K) {
|
|
|
netif_info(tp, probe, dev, "jumbo features [frames: %d bytes, "
|
|
|
"tx checksumming: %s]\n",
|