slicoss - use kzalloc
This patch uses kzalloc() where applicable.
drivers/staging/slicoss/slicoss.c +3 -6
@@ -2673,7 +2673,7 @@ static int slic_card_init(struct sliccar#if SLIC_DUMP_ENABLED if (!card->dumpbuffer) { - card->dumpbuffer =kmalloc (DUMP_PAGE_SIZE ,GFP_ATOMIC ); + card->dumpbuffer =kzalloc (DUMP_PAGE_SIZE ,GFP_ATOMIC );ASSERT (card->dumpbuffer);if (card->dumpbuffer ==NULL )
@@ -2683,7 +2683,6 @@ static int slic_card_init(struct sliccar* Smear the shared memory structure and then obtain * the PHYSICAL address of this structure */ -memset (card->dumpbuffer,0 ,DUMP_PAGE_SIZE ); card->dumpbuffer_phys =virt_to_bus (card->dumpbuffer); card->dumpbuffer_physh =SLIC_GET_ADDR_HIGH (card->dumpbuffer_phys); card->dumpbuffer_physl =SLIC_GET_ADDR_LOW (card->dumpbuffer_phys);
@@ -2692,7 +2691,7 @@ static int slic_card_init(struct sliccar* Allocate COMMAND BUFFER */ if (!card->cmdbuffer) { - card->cmdbuffer =kmalloc (sizeof (struct dump_cmd ),GFP_ATOMIC ); + card->cmdbuffer =kzalloc (sizeof (struct dump_cmd ),GFP_ATOMIC );ASSERT (card->cmdbuffer);if (card->cmdbuffer ==NULL )
@@ -2702,7 +2701,6 @@ static int slic_card_init(struct sliccar* Smear the shared memory structure and then obtain * the PHYSICAL address of this structure */ -memset (card->cmdbuffer,0 ,sizeof (struct dump_cmd )); card->cmdbuffer_phys =virt_to_bus (card->cmdbuffer); card->cmdbuffer_physh =SLIC_GET_ADDR_HIGH (card->cmdbuffer_phys); card->cmdbuffer_physl =SLIC_GET_ADDR_LOW (card->cmdbuffer_phys);
@@ -2833,9 +2831,8 @@ static u32 slic_card_locate(struct adapt }if (!physcard) {/* no structure allocated for this physical card yet */ - physcard =kmalloc (sizeof (struct physcard *),GFP_ATOMIC ); + physcard =kzalloc (sizeof (struct physcard *),GFP_ATOMIC );ASSERT (physcard); -memset (physcard,0 ,sizeof (struct physcard *));DBG_MSG ("\n%s Allocate a PHYSICALcard:\n PHYSICAL_Card[%p]\n\
Quoted 3 lines · Lior Dotan
This patch uses
kzalloc()where applicable.Signed-off-by Lior Dotan <[email protected]>
/drivers/staging/slicoss/slicoss.c
=======================================
drivers/staging/slicoss/slicoss.c +0 -0
@@ -2673,8 +2673,8 @@
static·int·slic_card_init(struct·sliccar #if·SLIC_DUMP_ENABLED
» if·(!card->dumpbuffer)·{
-» » card->dumpbuffer·=·kmalloc(DUMP_PAGE_SIZE,·GFP_ATOMIC); +» » card->dumpbuffer·=·kzalloc(DUMP_PAGE_SIZE,·GFP_ATOMIC); » » ASSERT(card->dumpbuffer);
» » if·(card->dumpbuffer·==·NULL)
@@ -2683,8 +2683,7 @@ static·int·slic_card_init(struct·sliccar
» ·*··Smear·the·shared·memory·structure·and·then·obtain » ·*··the·PHYSICAL·address·of·this·structure
» ·*/
-» memset(card->dumpbuffer,·0,·DUMP_PAGE_SIZE);
It's wrong, the function in called multiple times, the memset was called every time, now it would be called only for the first time.
-------- Original Message --------
Subject: Re: [STAGING] slicoss - use kzalloc
From: Jiri Slaby <[email protected]>
To: Lior Dotan <[email protected]>
CC: [email protected], [email protected], [email protected]
Date: 11/05/2008 12:01 AM
Quoted 25 lines · Lior Dotan
Quoted 3 lines
This patch uses
kzalloc()where applicable.Signed-off-by Lior Dotan <[email protected]>/drivers/staging/slicoss/slicoss.c
=======================================drivers/staging/slicoss/slicoss.c +0
-0@@ -2673,8 +2673,8 @@static·int·slic_card_init(struct·sliccar #if·SLIC_DUMP_ENABLED
» if·(!card->dumpbuffer)·{
-» » card->dumpbuffer·=·kmalloc(DUMP_PAGE_SIZE,·GFP_ATOMIC); +» » card->dumpbuffer·=·kzalloc(DUMP_PAGE_SIZE,·GFP_ATOMIC); » »ASSERT(card->dumpbuffer);
» » if·(card->dumpbuffer·==·NULL)drivers/staging/slicoss/slicoss.c +0
-0@@ -2683,8 +2683,7 @@static·int·slic_card_init(struct·sliccar
» ·*··Smear·the·shared·memory·structure·and·then·obtain » ·*··the·PHYSICAL·address·of·this·structure
» ·*/
-»memset(card->dumpbuffer,·0,·DUMP_PAGE_SIZE);
Quoted 2 lines
It's wrong, the function in called multiple times, the memset was called every time, now it would be called only for the first time.
You are right, thanks. Here's a fixed version.
This patch uses kzalloc() where really applicable.
drivers/staging/slicoss/slicoss.c +1 -2
@@ -2833,9 +2833,8 @@ static u32 slic_card_locate(struct adapt }if (!physcard) {/* no structure allocated for this physical card yet */ - physcard =kmalloc (sizeof (struct physcard *),GFP_ATOMIC ); + physcard =kzalloc (sizeof (struct physcard *),GFP_ATOMIC );ASSERT (physcard); -memset (physcard,0 ,sizeof (struct physcard *));DBG_MSG ("\n%s Allocate a PHYSICALcard:\n PHYSICAL_Card[%p]\n\
Quoted 1 line · Lior Dotan
This patch uses
kzalloc()where really applicable.
ack this, but there is another problem.
sizeof(struct physcard *) is wrong size for that allocation, care to send a fix for this (and revice the rest of allocations)? I wonder how this could work with SLAB_DEBUG on, maybe nobody tried...
Quoted 7 lines · Lior Dotan
Quoted 1 line
This patch uses
kzalloc()where really applicable.ack this, but there is another problem.
sizeof(struct physcard *)is wrong size for that allocation, care to send a fix for this (and revice the rest of allocations)? I wonder how this could work with
Fix attached. I only found two other places with the same problem.
Quoted 1 line
SLAB_DEBUGon, maybe nobody tried...
AFAIK there aren't a lot of testers for this drivers so the few that does probably didn't try it.
Fix sizeof to use the right type
drivers/staging/slicoss/slicoss.c +3 -3
@@ -323,7 +323,7 @@ static void slic_init_adapter(struct netindex, pslic_handle, adapter->pfree_slic_handles, pslic_handle->next);*/ adapter->pshmem = (struct slic_shmem *)pci_alloc_consistent (adapter->pcidev, -sizeof (struct slic_shmem *), +sizeof (struct slic_shmem ), &adapter-> phys_shmem);/*
@@ -1432,7 +1432,7 @@ static void slic_init_cleanup(struct adaDBG_MSG ("adapter[%p] port %d pshmem[%p] FreeShmem " , adapter, adapter->port, (void *) adapter->pshmem);pci_free_consistent (adapter->pcidev, -sizeof (struct slic_shmem *), +sizeof (struct slic_shmem ), adapter->pshmem, adapter->phys_shmem); adapter->pshmem =NULL ; adapter->phys_shmem = (dma_addr_t )NULL ;
@@ -2833,7 +2833,7 @@ static u32 slic_card_locate(struct adapt }if (!physcard) {/* no structure allocated for this physical card yet */ - physcard =kzalloc (sizeof (struct physcard *),GFP_ATOMIC ); + physcard =kzalloc (sizeof (struct physcard ),GFP_ATOMIC );ASSERT (physcard);DBG_MSG
Quoted 1 line · Lior Dotan
Fix sizeof to use the right type
Well, next step might be to investigate which allocs might be GFP_KERNEL instead of GFP_ATOMIC if you want to play with that ;).