From patchwork Thu Sep 1 09:17:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1118712 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p819IEgj003663 for ; Thu, 1 Sep 2011 09:18:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755285Ab1IAJSL (ORCPT ); Thu, 1 Sep 2011 05:18:11 -0400 Received: from mms3.broadcom.com ([216.31.210.19]:4208 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753666Ab1IAJRo (ORCPT ); Thu, 1 Sep 2011 05:17:44 -0400 Received: from [10.9.200.133] by MMS3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 01 Sep 2011 02:23:06 -0700 X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Thu, 1 Sep 2011 02:17:14 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id D561F74D05; Thu, 1 Sep 2011 02:17:27 -0700 (PDT) Received: from LTAMS-RVOSSEN (unknown [10.176.68.25]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id B4F7E20517; Thu, 1 Sep 2011 02:17:24 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1Qz3Ol-0002U6-MA; Thu, 01 Sep 2011 11:17:23 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 22/30] staging: brcm80211: remove sparse warnings from mac80211_if.c Date: Thu, 1 Sep 2011 11:17:12 +0200 Message-ID: <1314868640-9425-23-git-send-email-rvossen@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314868640-9425-1-git-send-email-rvossen@broadcom.com> References: <1314868640-9425-1-git-send-email-rvossen@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 624191703KO12131303-02-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 01 Sep 2011 09:18:14 +0000 (UTC) From: Arend van Spriel Some changes have been made to get rid of sparse warnings in the source file mac80211_if.c. Reported-by: Aaro Koskinen Reviewed-by: Roland Vossen Reviewed-by: Pieter-Paul Giesberts Signed-off-by: Roland Vossen --- 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 */