iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3c59x: remove useless VORTEX_PCI() invocations

Browse Source 
It's suboptimal to invoke quite complex VORTEX_PCI() macro every time we want
to get a 'struct pci_dev *' when we already have it in a variable...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sergei Shtylyov 2013-05-19 10:17:13 +00:00 committed by David S. Miller
parent 1e18583adc
commit 4fc1ad6f4b
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/3com/3c59x.c
View File

@ -1473,7 +1473,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
if (pdev) { if (pdev) {
vp->pm_state_valid = 1; vp->pm_state_valid = 1;
pci_save_state(VORTEX_PCI(vp)); pci_save_state(pdev);
acpi_set_WOL(dev); acpi_set_WOL(dev);
} }
retval = register_netdev(dev); retval = register_netdev(dev);
@ -3233,21 +3233,20 @@ static void vortex_remove_one(struct pci_dev *pdev)
vp = netdev_priv(dev); vp = netdev_priv(dev);
if (vp->cb_fn_base) if (vp->cb_fn_base)
pci_iounmap(VORTEX_PCI(vp), vp->cb_fn_base); pci_iounmap(pdev, vp->cb_fn_base);
unregister_netdev(dev); unregister_netdev(dev);
if (VORTEX_PCI(vp)) { pci_set_power_state(pdev, PCI_D0); /* Go active */
pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ if (vp->pm_state_valid)
if (vp->pm_state_valid) pci_restore_state(pdev);
pci_restore_state(VORTEX_PCI(vp)); pci_disable_device(pdev);
pci_disable_device(VORTEX_PCI(vp));
}
/* Should really use issue_and_wait() here */ /* Should really use issue_and_wait() here */
iowrite16(TotalReset | ((vp->drv_flags & EEPROM_RESET) ? 0x04 : 0x14), iowrite16(TotalReset | ((vp->drv_flags & EEPROM_RESET) ? 0x04 : 0x14),
vp->ioaddr + EL3_CMD); vp->ioaddr + EL3_CMD);
pci_iounmap(VORTEX_PCI(vp), vp->ioaddr); pci_iounmap(pdev, vp->ioaddr);
pci_free_consistent(pdev, pci_free_consistent(pdev,
sizeof(struct boom_rx_desc) * RX_RING_SIZE sizeof(struct boom_rx_desc) * RX_RING_SIZE