forcedeth: stop using net_device.{base_addr, irq}. (03a2384e) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/ethernet/nvidia/forcedeth.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -3943,13 +3943,11 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
		ret = pci_enable_msi(np->pci_dev);
		if (ret == 0) {
		np->msi_flags \|= NV_MSI_ENABLED;
		dev->irq = np->pci_dev->irq;
		if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0) {
		netdev_info(dev, "request_irq failed %d\n",
		ret);
		pci_disable_msi(np->pci_dev);
		np->msi_flags &= ~NV_MSI_ENABLED;
		dev->irq = np->pci_dev->irq;
		goto out_err;
		}

		@@ -5650,9 +5648,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
		np->base = ioremap(addr, np->register_size);
		if (!np->base)
		goto out_relreg;
		dev->base_addr = (unsigned long)np->base;

		dev->irq = pci_dev->irq;

		np->rx_ring_size = RX_RING_DEFAULT;
		np->tx_ring_size = TX_RING_DEFAULT;