From patchwork Thu Sep 1 09:17:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Vossen X-Patchwork-Id: 1118572 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 p819Hjmt002913 for ; Thu, 1 Sep 2011 09:17:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857Ab1IAJRm (ORCPT ); Thu, 1 Sep 2011 05:17:42 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:1176 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750889Ab1IAJRg (ORCPT ); Thu, 1 Sep 2011 05:17:36 -0400 Received: from [10.9.200.133] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 01 Sep 2011 02:23:19 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 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:08 -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 8C30674D03; 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 55D6B20514; Thu, 1 Sep 2011 02:17:24 -0700 (PDT) Received: from rvossen by LTAMS-RVOSSEN with local (Exim 4.74) ( envelope-from ) id 1Qz3Ol-0002Tx-8g; 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 19/30] staging: brcm80211: remove static function declaration in dhd_linux Date: Thu, 1 Sep 2011 11:17:09 +0200 Message-ID: <1314868640-9425-20-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: 6241908D5IS280554-01-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:17:46 +0000 (UTC) From: Franky Lin Reshuffle function order in dhd_linux of fullmac to get rid of static function declaration Reported-by: Johannes Berg Reviewed-by: Roland Vossen Reviewed-by: Arend van Spriel Signed-off-by: Roland Vossen --- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 40 ++++++++++------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 46f75b7..7121b16 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -120,12 +120,6 @@ uint brcmf_radio_up = 1; char iface_name[IFNAMSIZ] = "wlan"; module_param_string(iface_name, iface_name, IFNAMSIZ, 0); -static int brcmf_toe_get(struct brcmf_info *drvr_priv, int idx, u32 *toe_ol); -static int brcmf_toe_set(struct brcmf_info *drvr_priv, int idx, u32 toe_ol); -static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx, - void *pktdata, struct brcmf_event_msg *event_ptr, - void **data_ptr); - static int brcmf_net2idx(struct brcmf_info *drvr_priv, struct net_device *net) { int i = 0; @@ -600,6 +594,23 @@ void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state) netif_wake_queue(net); } +static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx, + void *pktdata, struct brcmf_event_msg *event, + void **data) +{ + int bcmerror = 0; + + bcmerror = brcmf_c_host_event(drvr_priv, ifidx, pktdata, event, data); + if (bcmerror != 0) + return bcmerror; + + if (drvr_priv->iflist[*ifidx]->net) + brcmf_cfg80211_event(drvr_priv->iflist[*ifidx]->net, + event, *data); + + return bcmerror; +} + void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, struct sk_buff *skb, int numpkt) { @@ -1483,23 +1494,6 @@ int brcmf_os_proto_unblock(struct brcmf_pub *drvr) return 0; } -static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx, - void *pktdata, struct brcmf_event_msg *event, - void **data) -{ - int bcmerror = 0; - - bcmerror = brcmf_c_host_event(drvr_priv, ifidx, pktdata, event, data); - if (bcmerror != 0) - return bcmerror; - - if (drvr_priv->iflist[*ifidx]->net) - brcmf_cfg80211_event(drvr_priv->iflist[*ifidx]->net, - event, *data); - - return bcmerror; -} - int brcmf_netdev_reset(struct net_device *dev, u8 flag) { struct brcmf_info *drvr_priv = *(struct brcmf_info **)netdev_priv(dev);