Commit 484d76fd authored by Kalesh AP's avatar Kalesh AP Committed by David S. Miller
Browse files

be2net: refactor adapter resource initialzation sequence into be_resume()



Most of the adapter initialisation sequences performed in be_resume(),
be_eeh_resume() and be_err_recover() are same. Renamed be_resume() to
be_pci_resume() and moved the common code to a new routine be_resume() to
avoid code duplication.
Signed-off-by: default avatarKalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9fa465c0
...@@ -4941,28 +4941,39 @@ static int be_func_init(struct be_adapter *adapter) ...@@ -4941,28 +4941,39 @@ static int be_func_init(struct be_adapter *adapter)
return 0; return 0;
} }
static int be_err_recover(struct be_adapter *adapter) static int be_resume(struct be_adapter *adapter)
{ {
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
struct device *dev = &adapter->pdev->dev;
int status; int status;
status = be_func_init(adapter); status = be_func_init(adapter);
if (status) if (status)
goto err; return status;
status = be_setup(adapter); status = be_setup(adapter);
if (status) if (status)
goto err; return status;
if (netif_running(netdev)) { if (netif_running(netdev)) {
status = be_open(netdev); status = be_open(netdev);
if (status) if (status)
goto err; return status;
} }
netif_device_attach(netdev); netif_device_attach(netdev);
return 0;
}
static int be_err_recover(struct be_adapter *adapter)
{
struct device *dev = &adapter->pdev->dev;
int status;
status = be_resume(adapter);
if (status)
goto err;
dev_info(dev, "Adapter recovery successful\n"); dev_info(dev, "Adapter recovery successful\n");
return 0; return 0;
err: err:
...@@ -5412,13 +5423,10 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state) ...@@ -5412,13 +5423,10 @@ static int be_suspend(struct pci_dev *pdev, pm_message_t state)
return 0; return 0;
} }
static int be_resume(struct pci_dev *pdev) static int be_pci_resume(struct pci_dev *pdev)
{ {
int status = 0;
struct be_adapter *adapter = pci_get_drvdata(pdev); struct be_adapter *adapter = pci_get_drvdata(pdev);
struct net_device *netdev = adapter->netdev; int status = 0;
netif_device_detach(netdev);
status = pci_enable_device(pdev); status = pci_enable_device(pdev);
if (status) if (status)
...@@ -5427,19 +5435,10 @@ static int be_resume(struct pci_dev *pdev) ...@@ -5427,19 +5435,10 @@ static int be_resume(struct pci_dev *pdev)
pci_set_power_state(pdev, PCI_D0); pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev); pci_restore_state(pdev);
status = be_func_init(adapter); status = be_resume(adapter);
if (status) if (status)
return status; return status;
be_setup(adapter);
if (netif_running(netdev)) {
rtnl_lock();
be_open(netdev);
rtnl_unlock();
}
netif_device_attach(netdev);
be_schedule_err_detection(adapter); be_schedule_err_detection(adapter);
if (adapter->wol_en) if (adapter->wol_en)
...@@ -5539,28 +5538,15 @@ static void be_eeh_resume(struct pci_dev *pdev) ...@@ -5539,28 +5538,15 @@ static void be_eeh_resume(struct pci_dev *pdev)
{ {
int status = 0; int status = 0;
struct be_adapter *adapter = pci_get_drvdata(pdev); struct be_adapter *adapter = pci_get_drvdata(pdev);
struct net_device *netdev = adapter->netdev;
dev_info(&adapter->pdev->dev, "EEH resume\n"); dev_info(&adapter->pdev->dev, "EEH resume\n");
pci_save_state(pdev); pci_save_state(pdev);
status = be_func_init(adapter); status = be_resume(adapter);
if (status) if (status)
goto err; goto err;
status = be_setup(adapter);
if (status)
goto err;
if (netif_running(netdev)) {
status = be_open(netdev);
if (status)
goto err;
}
netif_device_attach(netdev);
be_schedule_err_detection(adapter); be_schedule_err_detection(adapter);
return; return;
err: err:
...@@ -5579,7 +5565,7 @@ static struct pci_driver be_driver = { ...@@ -5579,7 +5565,7 @@ static struct pci_driver be_driver = {
.probe = be_probe, .probe = be_probe,
.remove = be_remove, .remove = be_remove,
.suspend = be_suspend, .suspend = be_suspend,
.resume = be_resume, .resume = be_pci_resume,
.shutdown = be_shutdown, .shutdown = be_shutdown,
.err_handler = &be_eeh_handlers .err_handler = &be_eeh_handlers
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment