sundance: stop using net_device.{base_addr, irq}. (c514f285) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/ethernet/dlink/sundance.c

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -522,9 +522,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
	cpu_to_le16(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));		cpu_to_le16(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));
	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);		memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);

	dev->base_addr = (unsigned long)ioaddr;
	dev->irq = irq;

	np = netdev_priv(dev);		np = netdev_priv(dev);
	np->base = ioaddr;		np->base = ioaddr;
	np->pci_dev = pdev;		np->pci_dev = pdev;
	@@ -828,18 +825,19 @@ static int netdev_open(struct net_device *dev)
	{		{
	struct netdev_private *np = netdev_priv(dev);		struct netdev_private *np = netdev_priv(dev);
	void __iomem *ioaddr = np->base;		void __iomem *ioaddr = np->base;
			const int irq = np->pci_dev->irq;
	unsigned long flags;		unsigned long flags;
	int i;		int i;

	/* Do we need to reset the chip??? */		/* Do we need to reset the chip??? */

	i = request_irq(dev->irq, intr_handler, IRQF_SHARED, dev->name, dev);		i = request_irq(irq, intr_handler, IRQF_SHARED, dev->name, dev);
	if (i)		if (i)
	return i;		return i;

	if (netif_msg_ifup(np))		if (netif_msg_ifup(np))
	printk(KERN_DEBUG "%s: netdev_open() irq %d.\n",		printk(KERN_DEBUG "%s: netdev_open() irq %d\n", dev->name, irq);
	dev->name, dev->irq);
	init_ring(dev);		init_ring(dev);

	iowrite32(np->rx_ring_dma, ioaddr + RxListPtr);		iowrite32(np->rx_ring_dma, ioaddr + RxListPtr);
	@@ -1814,7 +1812,7 @@ static int netdev_close(struct net_device *dev)
	}		}
	#endif /* __i386__ debugging only */		#endif /* __i386__ debugging only */

	free_irq(dev->irq, dev);		free_irq(np->pci_dev->irq, dev);

	del_timer_sync(&np->timer);		del_timer_sync(&np->timer);