From patchwork Thu Sep 1 09:16:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1118602 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p819HpAi014025 for ; Thu, 1 Sep 2011 09:17:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753910Ab1IAJRr (ORCPT ); Thu, 1 Sep 2011 05:17:47 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:1185 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751313Ab1IAJRg (ORCPT ); Thu, 1 Sep 2011 05:17:36 -0400 Received: from [10.9.200.131] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 01 Sep 2011 02:23:22 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Thu, 1 Sep 2011 02:17:30 -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 BA00274D0C; Thu, 1 Sep 2011 02:17:28 -0700 (PDT) Received: from LTAMS-RVOSSEN (unknown [10.176.68.25]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 33BC520503; Thu, 1 Sep 2011 02:17:21 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1Qz3Oj-0002T7-13; Thu, 01 Sep 2011 11:17:21 +0200 From: "Roland Vossen" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 02/30] staging: brcm80211: removed static function declarations in alloc.c Date: Thu, 1 Sep 2011 11:16:52 +0200 Message-ID: <1314868640-9425-3-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: 624190805IS280574-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 (demeter1.kernel.org [140.211.167.41]); Thu, 01 Sep 2011 09:17:51 +0000 (UTC) Reported-by: Johannes Berg Signed-off-by: Roland Vossen --- drivers/staging/brcm80211/brcmsmac/alloc.c | 39 +++++++++++---------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/alloc.c b/drivers/staging/brcm80211/brcmsmac/alloc.c index 7dc2875..52ca7e3 100644 --- a/drivers/staging/brcm80211/brcmsmac/alloc.c +++ b/drivers/staging/brcm80211/brcmsmac/alloc.c @@ -1,4 +1,4 @@ -/* +#/* * Copyright (c) 2010 Broadcom Corporation * * Permission to use, copy, modify, and/or distribute this software for any @@ -20,13 +20,6 @@ #include "main.h" #include "alloc.h" -static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit); -static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg); -static struct brcms_pub *brcms_c_pub_malloc(uint unit, - uint *err, uint devid); -static void brcms_c_pub_mfree(struct brcms_pub *pub); -static void brcms_c_tunables_init(struct brcms_tunables *tunables, uint devid); - static void brcms_c_tunables_init(struct brcms_tunables *tunables, uint devid) { tunables->ntxd = NTXD; @@ -45,6 +38,16 @@ static void brcms_c_tunables_init(struct brcms_tunables *tunables, uint devid) tunables->txsbnd = TXSBND; } +static void brcms_c_pub_mfree(struct brcms_pub *pub) +{ + if (pub == NULL) + return; + + kfree(pub->multicast); + kfree(pub->tunables); + kfree(pub); +} + static struct brcms_pub *brcms_c_pub_malloc(uint unit, uint *err, uint devid) { struct brcms_pub *pub; @@ -77,14 +80,14 @@ static struct brcms_pub *brcms_c_pub_malloc(uint unit, uint *err, uint devid) return NULL; } -static void brcms_c_pub_mfree(struct brcms_pub *pub) +static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg) { - if (pub == NULL) + if (cfg == NULL) return; - kfree(pub->multicast); - kfree(pub->tunables); - kfree(pub); + kfree(cfg->maclist); + kfree(cfg->current_bss); + kfree(cfg); } static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit) @@ -106,16 +109,6 @@ static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit) return NULL; } -static void brcms_c_bsscfg_mfree(struct brcms_bss_cfg *cfg) -{ - if (cfg == NULL) - return; - - kfree(cfg->maclist); - kfree(cfg->current_bss); - kfree(cfg); -} - static void brcms_c_bsscfg_ID_assign(struct brcms_c_info *wlc, struct brcms_bss_cfg *bsscfg) {