Skip to content

Commit

Permalink
staging: brcm80211: remove sparse warnings from mac80211_if.c
Browse files Browse the repository at this point in the history
Some changes have been made to get rid of sparse warnings in the
source file mac80211_if.c.

Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Arend van Spriel authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent bc12752 commit 4f80f93
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/brcm80211/brcmsmac/mac80211_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct firmware_hdr {
u32 idx;
};

char *brcms_firmwares[MAX_FW_IMAGES] = {
static const char * const brcms_firmwares[MAX_FW_IMAGES] = {
"brcm/bcm43xx",
NULL
};
Expand Down Expand Up @@ -1012,7 +1012,7 @@ static void brcms_free(struct brcms_info *wl)
* after calling unregister_netdev() .
*/
if (wl->regsva)
iounmap((void *)wl->regsva);
iounmap(wl->regsva);

wl->regsva = NULL;
}
Expand Down Expand Up @@ -1596,7 +1596,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
if (!t) {
wiphy_err(wl->wiphy, "wl%d: brcms_init_timer: out of memory\n",
wl->pub->unit);
return 0;
return NULL;
}

init_timer(&t->timer);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/brcmsmac/mac80211_if.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct brcms_info {
spinlock_t isr_lock; /* per-device ISR synchronization lock */

/* regsva for unmap in brcms_free() */
void *regsva; /* opaque chip registers virtual address */
void __iomem *regsva; /* opaque chip registers virtual address */

/* timer related fields */
atomic_t callbacks; /* # outstanding callback functions */
Expand Down

0 comments on commit 4f80f93

Please sign in to comment.