From bae5c3d1427a9e685e4e9f7fc74f1c46aec2de62 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Tue, 23 Oct 2012 18:08:43 -0400 Subject: [PATCH] staging: slicoss: get rid of slic_cmdqmem_init function this function memset's the cmdqmem, instead do it in slic_cmdq_init. Signed-off-by: Devendra Naga Signed-off-by: Greg Kroah-Hartman --- drivers/staging/slicoss/slicoss.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 86c8c8e..f08f459 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/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); -- 2.7.4