From: Arend van Spriel <[email protected]> Some changes have been made to get rid of sparse warnings in the source file mac80211_if.c.
Reported-by: Aaro Koskinen <[email protected]> Reviewed-by: Roland Vossen <[email protected]> Reviewed-by: Pieter-Paul Giesberts <[email protected]> Signed-off-by: Roland Vossen <[email protected]> --- drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 6 +++--- drivers/staging/brcm80211/brcmsmac/mac80211_if.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c index bd989737..6ed80b2 100644 --- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c @@ -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 }; @@ -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; } @@ -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); diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h index 1d52803..1eb36ed 100644 --- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h +++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h @@ -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 */ -- 1.7.4.1 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
