evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

atl1e: stop using net_device.{base_addr, irq}.

Browse source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jay Cliburn <jcliburn@gmail.com>
Cc: Chris Snook <chris.snook@gmail.com>
This commit is contained in:
Francois Romieu 2012-03-09 19:28:28 +01:00
parent 436dfc461b
commit b5efab99ed
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/net/ethernet/atheros/atl1e/atl1e_main.c
View file

@ -1883,27 +1883,24 @@ static int atl1e_request_irq(struct atl1e_adapter *adapter)
int err = 0; int err = 0;
adapter->have_msi = true; adapter->have_msi = true;
err = pci_enable_msi(adapter->pdev); err = pci_enable_msi(pdev);
if (err) { if (err) {
netdev_dbg(adapter->netdev, netdev_dbg(netdev,
"Unable to allocate MSI interrupt Error: %d\n", err); "Unable to allocate MSI interrupt Error: %d\n", err);
adapter->have_msi = false; adapter->have_msi = false;
} else }
netdev->irq = pdev->irq;
if (!adapter->have_msi) if (!adapter->have_msi)
flags |= IRQF_SHARED; flags |= IRQF_SHARED;
err = request_irq(adapter->pdev->irq, atl1e_intr, flags, err = request_irq(pdev->irq, atl1e_intr, flags, netdev->name, netdev);
netdev->name, netdev);
if (err) { if (err) {
netdev_dbg(adapter->netdev, netdev_dbg(adapter->netdev,
"Unable to allocate interrupt Error: %d\n", err); "Unable to allocate interrupt Error: %d\n", err);
if (adapter->have_msi) if (adapter->have_msi)
pci_disable_msi(adapter->pdev); pci_disable_msi(pdev);
return err; return err;
} }
netdev_dbg(adapter->netdev, "atl1e_request_irq OK\n"); netdev_dbg(netdev, "atl1e_request_irq OK\n");
return err; return err;
} }
@ -2233,7 +2230,6 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
SET_NETDEV_DEV(netdev, &pdev->dev); SET_NETDEV_DEV(netdev, &pdev->dev);
pci_set_drvdata(pdev, netdev); pci_set_drvdata(pdev, netdev);
netdev->irq = pdev->irq;
netdev->netdev_ops = &atl1e_netdev_ops; netdev->netdev_ops = &atl1e_netdev_ops;
netdev->watchdog_timeo = AT_TX_WATCHDOG; netdev->watchdog_timeo = AT_TX_WATCHDOG;
@ -2319,7 +2315,6 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
netdev_err(netdev, "cannot map device registers\n"); netdev_err(netdev, "cannot map device registers\n");
goto err_ioremap; goto err_ioremap;
} }
netdev->base_addr = (unsigned long)adapter->hw.hw_addr;
/* init mii data */ /* init mii data */
adapter->mii.dev = netdev; adapter->mii.dev = netdev;