iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: gdm72xx: simplify alloc_tx_struct and alloc_rx_struct

Browse Source 
This patch simplifies alloc_tx_struct and alloc_rx_struct in gdm_sdio.c
and gdm_usb.c by replacing kmalloc+memset with kzalloc and reorganizing
the code.

Signed-off-by: Ben Chan <benchan@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ben Chan 2012-09-12 11:43:41 -07:00 committed by Greg Kroah-Hartman
parent b37c1aeed8
commit 129575f2a8
2 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/gdm72xx/gdm_sdio.c
View File

@ -60,25 +60,20 @@ static void hexdump(char *title, u8 *data, int len)
static struct sdio_tx *alloc_tx_struct(struct tx_cxt *tx)
{
struct sdio_tx *t = NULL;
struct sdio_tx *t = kzalloc(sizeof(*t), GFP_ATOMIC);
t = kzalloc(sizeof(*t), GFP_ATOMIC);
if (t == NULL)
goto out;
if (!t)
return NULL;
t->buf = kmalloc(TX_BUF_SIZE, GFP_ATOMIC);
if (t->buf == NULL)
goto out;
if (!t->buf) {
kfree(t);
return NULL;
}
t->tx_cxt = tx;
return t;
out:
if (t) {
kfree(t->buf);
kfree(t);
}
return NULL;
}
static void free_tx_struct(struct sdio_tx *t)
@ -91,15 +86,10 @@ static void free_tx_struct(struct sdio_tx *t)
static struct sdio_rx *alloc_rx_struct(struct rx_cxt *rx)
{
struct sdio_rx *r = NULL;
struct sdio_rx *r = kzalloc(sizeof(*r), GFP_ATOMIC);
r = kmalloc(sizeof(*r), GFP_ATOMIC);
if (!r)
return NULL;
memset(r, 0, sizeof(*r));
r->rx_cxt = rx;
if (r)
r->rx_cxt = rx;
return r;
}

44
drivers/staging/gdm72xx/gdm_usb.c
View File

@ -73,27 +73,23 @@ static void hexdump(char *title, u8 *data, int len)
static struct usb_tx *alloc_tx_struct(struct tx_cxt *tx)
{
struct usb_tx *t = NULL;
struct usb_tx *t = kzalloc(sizeof(*t), GFP_ATOMIC);
t = kzalloc(sizeof(*t), GFP_ATOMIC);
if (t == NULL)
goto out;
if (!t)
return NULL;
t->urb = usb_alloc_urb(0, GFP_ATOMIC);
t->buf = kmalloc(TX_BUF_SIZE, GFP_ATOMIC);
if (t->urb == NULL || t->buf == NULL)
goto out;
if (!t->urb || !t->buf) {
usb_free_urb(t->urb);
kfree(t->buf);
kfree(t);
return NULL;
}
t->tx_cxt = tx;
return t;
out:
if (t) {
usb_free_urb(t->urb);
kfree(t->buf);
kfree(t);
}
return NULL;
}
static void free_tx_struct(struct usb_tx *t)
@ -107,28 +103,22 @@ static void free_tx_struct(struct usb_tx *t)
static struct usb_rx *alloc_rx_struct(struct rx_cxt *rx)
{
struct usb_rx *r = NULL;
struct usb_rx *r = kzalloc(sizeof(*r), GFP_ATOMIC);
r = kmalloc(sizeof(*r), GFP_ATOMIC);
if (r == NULL)
goto out;
memset(r, 0, sizeof(*r));
if (!r)
return NULL;
r->urb = usb_alloc_urb(0, GFP_ATOMIC);
r->buf = kmalloc(RX_BUF_SIZE, GFP_ATOMIC);
if (r->urb == NULL || r->buf == NULL)
goto out;
r->rx_cxt = rx;
return r;
out:
if (r) {
if (!r->urb || !r->buf) {
usb_free_urb(r->urb);
kfree(r->buf);
kfree(r);
return NULL;
}
return NULL;
r->rx_cxt = rx;
return r;
}
static void free_rx_struct(struct usb_rx *r)