Home » Mailing list archives » linux-netdev » 2009 » March » 9

[net-next PATCH 01/12] qlge: Move reset logic into asic_reset_worker func.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Ron Mercer
Subject: [net-next PATCH 01/12] qlge: Move reset logic into asic_reset_worker func.
Date: Monday, March 9, 2009 - 1:59 pm

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

Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
---
 drivers/net/qlge/qlge_main.c |   41 ++++++++++++++++++-----------------------
 1 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index d800ff4..ed7138d 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3263,28 +3263,6 @@ err_init:
 	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)
 {
 	ql_free_mem_resources(qdev);
@@ -3617,7 +3595,24 @@ static void ql_asic_reset_work(struct work_struct *work)
 {
 	struct ql_adapter *qdev =
 	    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 = {
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[net-next PATCH0/12] qlge: More features and cleanup., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 01/12] qlge: Move reset logic into asic_re ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 02/12] qlge: Remove debug junk from asic r ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 03/12] qlge: Increase filtering for inboun ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 04/12] qlge: Add support for GRO., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 05/12] qlge: Add tx multiqueue support., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 06/12] qlge: bugfix: Tell hw to strip vlan ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 07/12] qlge: Get rid of irqsave/restore in ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 08/12] qlge: Clear shadow registers before ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 09/12] qlge: Remove spinlock from asic ini ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 10/12] qlge: bugfix: Move netif_napi_del() ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 11/12] qlge: bugfix: Pad outbound frames s ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
[net-next PATCH 12/12] qlge: bugfix: Fix endian issue rela ..., Ron Mercer, (Mon Mar 9, 1:59 pm)
Re: [net-next PATCH0/12] qlge: More features and cleanup., David Miller, (Tue Mar 10, 4:46 am)