---

yaml --- r: 337201 b: refs/heads/master c: bae5c3d h: refs/heads/master i: 337199: a70bf9c v: v3
git-mirror · Oct 24, 2012 · 74c2400 · 74c2400
1 parent 9037817
commit 74c2400
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ffa3b91a2a155c26da43495bab01a12d946b253
+refs/heads/master: bae5c3d1427a9e685e4e9f7fc74f1c46aec2de62
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
@@ -1424,13 +1424,6 @@ static struct slic_rspbuf *slic_rspqueue_getnext(struct adapter *adapter)
 	return buf;
 }
 
-static void slic_cmdqmem_init(struct adapter *adapter)
-{
-	struct slic_cmdqmem *cmdqmem = &adapter->cmdqmem;
-
-	memset(cmdqmem, 0, sizeof(struct slic_cmdqmem));
-}
-
 static void slic_cmdqmem_free(struct adapter *adapter)
 {
 	struct slic_cmdqmem *cmdqmem = &adapter->cmdqmem;
@@ -1559,7 +1552,7 @@ static int slic_cmdq_init(struct adapter *adapter)
 	spin_lock_init(&adapter->cmdq_all.lock.lock);
 	spin_lock_init(&adapter->cmdq_free.lock.lock);
 	spin_lock_init(&adapter->cmdq_done.lock.lock);
-	slic_cmdqmem_init(adapter);
+	memset(&adapter->cmdqmem, 0, sizeof(struct slic_cmdqmem));
 	adapter->slic_handle_ix = 1;
 	for (i = 0; i < SLIC_CMDQ_INITPAGES; i++) {
 		pageaddr = slic_cmdqmem_addpage(adapter);