lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qlge: Move reset logic into asic_reset_worker func.

Browse Source 
Get rid of extraneous ql_cycle_adapter.  It's only called from the one
place.

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ron Mercer
2009-03-09 10:59:17 +00:00
committed by David S. Miller
parent 1a77733ccb
commit db98812f6b
1 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/qlge/qlge_main.c
View File

@@ -3263,28 +3263,6 @@ err_init:
return err; return err;
} }
static int ql_cycle_adapter(struct ql_adapter *qdev)
{
int status;
status = ql_adapter_down(qdev);
if (status)
goto error;
status = ql_adapter_up(qdev);
if (status)
goto error;
return status;
error:
QPRINTK(qdev, IFUP, ALERT,
"Driver up/down cycle failed, closing device\n");
rtnl_lock();
dev_close(qdev->ndev);
rtnl_unlock();
return status;
}
static void ql_release_adapter_resources(struct ql_adapter *qdev) static void ql_release_adapter_resources(struct ql_adapter *qdev)
{ {
ql_free_mem_resources(qdev); ql_free_mem_resources(qdev);
@@ -3617,7 +3595,24 @@ static void ql_asic_reset_work(struct work_struct *work)
{ {
struct ql_adapter *qdev = struct ql_adapter *qdev =
container_of(work, struct ql_adapter, asic_reset_work.work); container_of(work, struct ql_adapter, asic_reset_work.work);
ql_cycle_adapter(qdev); int status;
status = ql_adapter_down(qdev);
if (status)
goto error;
status = ql_adapter_up(qdev);
if (status)
goto error;
return;
error:
QPRINTK(qdev, IFUP, ALERT,
"Driver up/down cycle failed, closing device\n");
rtnl_lock();
set_bit(QL_ADAPTER_UP, &qdev->flags);
dev_close(qdev->ndev);
rtnl_unlock();
} }
static struct nic_operations qla8012_nic_ops = { static struct nic_operations qla8012_nic_ops = {