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

Commit 4c305fa2 authored by Nithin Sujir's avatar Nithin Sujir Committed by David S. Miller
Browse files

tg3: Implement the shutdown handler 



Also remove the call to tg3_power_down_prepare() in tg3_power_down()
since tg3_close() calls it.

Signed-off-by: default avatarNithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5137a2ee

drivers/net/ethernet/broadcom/tg3.c

+18 −2
Original line number Diff line number Diff line
@@ -4226,8 +4226,6 @@ static int tg3_power_down_prepare(struct tg3 *tp) 


static void tg3_power_down(struct tg3 *tp)

{

	tg3_power_down_prepare(tp);



	pci_wake_from_d3(tp->pdev, tg3_flag(tp, WOL_ENABLE));

	pci_set_power_state(tp->pdev, PCI_D3hot);

}
@@ -17743,6 +17741,23 @@ static int tg3_resume(struct device *device) 


static SIMPLE_DEV_PM_OPS(tg3_pm_ops, tg3_suspend, tg3_resume);



static void tg3_shutdown(struct pci_dev *pdev)

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct tg3 *tp = netdev_priv(dev);



	rtnl_lock();

	netif_device_detach(dev);



	if (netif_running(dev))

		dev_close(dev);



	if (system_state == SYSTEM_POWER_OFF)

		tg3_power_down(tp);



	rtnl_unlock();

}



/**

 * tg3_io_error_detected - called when PCI error is detected

 * @pdev: Pointer to PCI device
@@ -17898,6 +17913,7 @@ static struct pci_driver tg3_driver = { 
	.remove		= tg3_remove_one,

	.err_handler	= &tg3_err_handler,

	.driver.pm	= &tg3_pm_ops,

	.shutdown	= tg3_shutdown,

};



module_pci_driver(tg3_driver);