diff options
| author | mike.rapoport@gmail.com | 2010-10-13 00:09:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-10-14 21:28:58 +0200 |
| commit | 5fcc1fcb2ec18094b3a8022b1974c0b2e9f5f73c (patch) | |
| tree | c60c70596d4dcc69e23a1830b4e60e5c3f262787 /drivers/staging/brcm80211/sys/wlc_event.c | |
| parent | staging: brcm80211: remove osl_malloced()/MALLOCED() (diff) | |
| download | kernel-qcow2-linux-5fcc1fcb2ec18094b3a8022b1974c0b2e9f5f73c.tar.gz kernel-qcow2-linux-5fcc1fcb2ec18094b3a8022b1974c0b2e9f5f73c.tar.xz kernel-qcow2-linux-5fcc1fcb2ec18094b3a8022b1974c0b2e9f5f73c.zip | |
staging: brcm80211: replace MALLOC() with k[zm]alloc
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys/wlc_event.c')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_event.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c index e7873907e50d..5ee0fd029724 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.c +++ b/drivers/staging/brcm80211/sys/wlc_event.c @@ -58,12 +58,10 @@ wlc_eventq_t *wlc_eventq_attach(wlc_pub_t *pub, struct wlc_info *wlc, void *wl, { wlc_eventq_t *eq; - eq = (wlc_eventq_t *) MALLOC(pub->osh, sizeof(wlc_eventq_t)); + eq = kzalloc(sizeof(wlc_eventq_t), GFP_ATOMIC); if (eq == NULL) return NULL; - bzero(eq, sizeof(wlc_eventq_t)); - eq->cb = cb; eq->wlc = wlc; eq->wl = wl; @@ -125,12 +123,11 @@ wlc_event_t *wlc_event_alloc(wlc_eventq_t *eq) { wlc_event_t *e; - e = MALLOC(eq->pub->osh, sizeof(wlc_event_t)); + e = kzalloc(sizeof(wlc_event_t), GFP_ATOMIC); if (e == NULL) return NULL; - bzero(e, sizeof(wlc_event_t)); return e; } |