Skip to content

Commit

Permalink
Staging: SLICOSS: use gfp_kernel where possible
Browse files Browse the repository at this point in the history
Use GFP_KERNEL instead of GFP_ATOMIC where possible.

Signed_off-by: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Lior Dotan authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 1025744 commit 2bb3473
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/slicoss/slicoss.c
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,7 @@ static int slic_mcast_add_list(struct adapter *adapter, char *address)
}

/* Doesn't already exist. Allocate a structure to hold it */
mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC);
mcaddr = kmalloc(sizeof(struct mcast_address), GFP_KERNEL);
if (mcaddr == NULL)
return 1;

Expand Down Expand Up @@ -2648,7 +2648,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)

#if SLIC_DUMP_ENABLED
if (!card->dumpbuffer) {
card->dumpbuffer = kmalloc(DUMP_PAGE_SIZE, GFP_ATOMIC);
card->dumpbuffer = kmalloc(DUMP_PAGE_SIZE, GFP_KERNEL);

ASSERT(card->dumpbuffer);
if (card->dumpbuffer == NULL)
Expand All @@ -2667,7 +2667,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
* Allocate COMMAND BUFFER
*/
if (!card->cmdbuffer) {
card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_ATOMIC);
card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_KERNEL);

ASSERT(card->cmdbuffer);
if (card->cmdbuffer == NULL)
Expand Down Expand Up @@ -2808,7 +2808,7 @@ static u32 slic_card_locate(struct adapter *adapter)
}
if (!physcard) {
/* no structure allocated for this physical card yet */
physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);
physcard = kzalloc(sizeof(struct physcard), GFP_KERNEL);
ASSERT(physcard);

DBG_MSG
Expand Down

0 comments on commit 2bb3473

Please sign in to comment.