From 5fcc1fcb2ec18094b3a8022b1974c0b2e9f5f73c Mon Sep 17 00:00:00 2001 From: mike.rapoport@gmail.com Date: Wed, 13 Oct 2010 00:09:10 +0200 Subject: staging: brcm80211: replace MALLOC() with k[zm]alloc Signed-off-by: Mike Rapoport Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/sys/wlc_event.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/staging/brcm80211/sys/wlc_event.c') 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; } -- cgit v1.2.3-55-g7522