Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fc1ad6f authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

3c59x: remove useless VORTEX_PCI() invocations 



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: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1e18583a

drivers/net/ethernet/3com/3c59x.c

+8 −9
Original line number Diff line number Diff line
@@ -1473,7 +1473,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq, 


	if (pdev) {

		vp->pm_state_valid = 1;

 		pci_save_state(VORTEX_PCI(vp));

		pci_save_state(pdev);

 		acpi_set_WOL(dev);

	}

	retval = register_netdev(dev);
@@ -3233,21 +3233,20 @@ static void vortex_remove_one(struct pci_dev *pdev) 
	vp = netdev_priv(dev);



	if (vp->cb_fn_base)

		pci_iounmap(VORTEX_PCI(vp), vp->cb_fn_base);

		pci_iounmap(pdev, vp->cb_fn_base);



	unregister_netdev(dev);



	if (VORTEX_PCI(vp)) {

		pci_set_power_state(VORTEX_PCI(vp), PCI_D0);	/* Go active */

	pci_set_power_state(pdev, PCI_D0);	/* Go active */

	if (vp->pm_state_valid)

			pci_restore_state(VORTEX_PCI(vp));

		pci_disable_device(VORTEX_PCI(vp));

	}

		pci_restore_state(pdev);

	pci_disable_device(pdev);



	/* Should really use issue_and_wait() here */

	iowrite16(TotalReset | ((vp->drv_flags & EEPROM_RESET) ? 0x04 : 0x14),

	     vp->ioaddr + EL3_CMD);



	pci_iounmap(VORTEX_PCI(vp), vp->ioaddr);

	pci_iounmap(pdev, vp->ioaddr);



	pci_free_consistent(pdev,

						sizeof(struct boom_rx_desc) * RX_RING_SIZE