Skip to content

Commit

Permalink
[PATCH] Char: sx, use kcalloc
Browse files Browse the repository at this point in the history
Convert self-implemented kzalloc to kernel kcalloc.

Cc: <R.E.Wolff@BitWizard.nl>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent 5572e10 commit 4a7cb69
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions drivers/char/sx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2267,18 +2267,6 @@ static int sx_init_drivers(void)
return 0;
}


static void * ckmalloc (int size)
{
void *p;

p = kmalloc(size, GFP_KERNEL);
if (p)
memset(p, 0, size);
return p;
}


static int sx_init_portstructs (int nboards, int nports)
{
struct sx_board *board;
Expand All @@ -2291,7 +2279,7 @@ static int sx_init_portstructs (int nboards, int nports)

/* Many drivers statically allocate the maximum number of ports
There is no reason not to allocate them dynamically. Is there? -- REW */
sx_ports = ckmalloc(nports * sizeof (struct sx_port));
sx_ports = kcalloc(nports, sizeof(struct sx_port), GFP_KERNEL);
if (!sx_ports)
return -ENOMEM;

Expand Down

0 comments on commit 4a7cb69

Please sign in to comment.