Commit 5f3eb881 authored by Francois Romieu's avatar Francois Romieu Committed by Greg Kroah-Hartman
Browse files

et131x: kiss netdev.{base_addr, irq} goodbye. 



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Acked-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c3abb687

drivers/staging/et131x/et131x.c

+6 −11
Original line number Original line Diff line number Diff line
@@ -4366,10 +4366,6 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev, 
	adapter->pdev = pci_dev_get(pdev);

	adapter->pdev = pci_dev_get(pdev);

	adapter->netdev = netdev;

	adapter->netdev = netdev;





	/* Do the same for the netdev struct */

	netdev->irq = pdev->irq;

	netdev->base_addr = pci_resource_start(pdev, 0);



	/* Initialize spinlocks here */

	/* Initialize spinlocks here */

	spin_lock_init(&adapter->lock);

	spin_lock_init(&adapter->lock);

	spin_lock_init(&adapter->tcb_send_qlock);

	spin_lock_init(&adapter->tcb_send_qlock);
@@ -4834,8 +4830,10 @@ static struct net_device_stats *et131x_stats(struct net_device *netdev) 
 */

 */

static int et131x_open(struct net_device *netdev)

static int et131x_open(struct net_device *netdev)

{

{

	int result = 0;

	struct et131x_adapter *adapter = netdev_priv(netdev);

	struct et131x_adapter *adapter = netdev_priv(netdev);

	struct pci_dev *pdev = adapter->pdev;

	unsigned int irq = pdev->irq;

	int result;





	/* Start the timer to track NIC errors */

	/* Start the timer to track NIC errors */

	init_timer(&adapter->error_timer);

	init_timer(&adapter->error_timer);
@@ -4844,12 +4842,9 @@ static int et131x_open(struct net_device *netdev) 
	adapter->error_timer.data = (unsigned long)adapter;

	adapter->error_timer.data = (unsigned long)adapter;

	add_timer(&adapter->error_timer);

	add_timer(&adapter->error_timer);





	/* Register our IRQ */

	result = request_irq(irq, et131x_isr, IRQF_SHARED, netdev->name, netdev);

	result = request_irq(netdev->irq, et131x_isr, IRQF_SHARED,

					netdev->name, netdev);

	if (result) {

	if (result) {

		dev_err(&adapter->pdev->dev, "could not register IRQ %d\n",

		dev_err(&pdev->dev, "could not register IRQ %d\n", irq);

			netdev->irq);

		return result;

		return result;

	}

	}
@@ -4873,7 +4868,7 @@ static int et131x_close(struct net_device *netdev) 
	et131x_down(netdev);

	et131x_down(netdev);





	adapter->flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE;

	adapter->flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE;

	free_irq(netdev->irq, netdev);

	free_irq(adapter->pdev->irq, netdev);





	/* Stop the error timer */

	/* Stop the error timer */

	return del_timer_sync(&adapter->error_timer);

	return del_timer_sync(&adapter->error_timer);