From patchwork Wed Oct 29 22:42:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 39803 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C388424046 for ; Wed, 29 Oct 2014 22:43:14 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id c41sf1321745eek.4 for ; Wed, 29 Oct 2014 15:43:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=HGIa5+4YrD515/lFctk3ThEUDCh5MFuAtrfjivfEFpk=; b=QA5kFR5QMarp+14k5NyvuL+rTiQmvDfBTcAgYnwr8cMGHRWbGtLAjl+St0u5ma02BP 5IDPy1eO3orl1+NXWbPkAg+99LDDdto5Z7wBWDQQwRegslEQBykf1ULSkqxeX+kL2327 J0c7ig6CEATLkPRJ7pnHSnFrk7PCPpB9qen0EEN7psOg4H/yVh9zYhhGnvui/0GUMUOU rzZS6esak2lF4+2SyyL/1NlWd5BM8ccNRRMzk8OzIk5nTVg+MbJy/x3iKjA13mQ/fMO7 YNnpZBwEQZWqxwpvqLT4grqeTsSm8sA30oSP65nUJGiZwtCL6YIuGgGy0HnMhZXepjgG uEvg== X-Gm-Message-State: ALoCoQkPMtt6jnSe/XwQKCayvR9MLSJgAJeC8E8P8JEVg3N/2NG8sOedm7VSVX8SGUy+8i1XcDaY X-Received: by 10.180.186.142 with SMTP id fk14mr6583479wic.4.1414622593957; Wed, 29 Oct 2014 15:43:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.225 with SMTP id r1ls253163lal.84.gmail; Wed, 29 Oct 2014 15:43:13 -0700 (PDT) X-Received: by 10.112.148.199 with SMTP id tu7mr14737065lbb.7.1414622593676; Wed, 29 Oct 2014 15:43:13 -0700 (PDT) Received: from mail-lb0-x22a.google.com (mail-lb0-x22a.google.com. [2a00:1450:4010:c04::22a]) by mx.google.com with ESMTPS id cb5si9320548lad.16.2014.10.29.15.43.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 15:43:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) client-ip=2a00:1450:4010:c04::22a; Received: by mail-lb0-f170.google.com with SMTP id 10so3381650lbg.1 for ; Wed, 29 Oct 2014 15:43:13 -0700 (PDT) X-Received: by 10.112.14.69 with SMTP id n5mr14536140lbc.34.1414622593575; Wed, 29 Oct 2014 15:43:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp744491lbz; Wed, 29 Oct 2014 15:43:12 -0700 (PDT) X-Received: by 10.70.90.11 with SMTP id bs11mr13499833pdb.16.1414622591949; Wed, 29 Oct 2014 15:43:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a5si4959323pdi.224.2014.10.29.15.43.11 for ; Wed, 29 Oct 2014 15:43:11 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757705AbaJ2Wms (ORCPT + 26 others); Wed, 29 Oct 2014 18:42:48 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:43854 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757581AbaJ2Wmp (ORCPT ); Wed, 29 Oct 2014 18:42:45 -0400 Received: by mail-pa0-f51.google.com with SMTP id kq14so4095351pab.38 for ; Wed, 29 Oct 2014 15:42:44 -0700 (PDT) X-Received: by 10.67.14.129 with SMTP id fg1mr13020081pad.114.1414622564748; Wed, 29 Oct 2014 15:42:44 -0700 (PDT) Received: from galdor.websterwood.com (50-206-118-3-static.hfc.comcastbusiness.net. [50.206.118.3]) by mx.google.com with ESMTPSA id lr4sm5274357pab.42.2014.10.29.15.42.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 15:42:43 -0700 (PDT) From: Behan Webster To: andriy.shevchenko@linux.intel.com, aysemelikeyurtoglu@gmail.com, matthias.schoepe@studium.uni-erlangen.de, mdcasey@chabloom.com, peter.senna@gmail.com, rashika.kheria@gmail.com, standby24x7@gmail.com Cc: behanw@converseincode.com, akpm@linux-foundation.org, andreas.frembs@studium.uni-erlangen.de, devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, mahati.chamarthy@gmail.com, peter.p.waskiewicz.jr@intel.com, quozl@laptop.org, valentina.manea.m@gmail.com, Arnd Bergmann Subject: [PATCH 3/4] staging, rtl8192e, LLVMLinux: Remove unused prototype Date: Wed, 29 Oct 2014 15:42:22 -0700 Message-Id: <1414622543-22969-4-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414622543-22969-1-git-send-email-behanw@converseincode.com> References: <1414622543-22969-1-git-send-email-behanw@converseincode.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: behanw@converseincode.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@ Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , MgntQuery_MgntFrameTxRate is only used within rtllib_softmac.c, so it really should be static instead of extern. Since it is currently extern a warning is generated because a different function of the same name is defined staticlly in ieee80211_softmac.c Removing the incorrect extern declaration and defining the rtllib_softmac version of this routine static fixes the warning. Signed-off-by: Behan Webster Suggested-by: Arnd Bergmann Cc: Arnd Bergmann --- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 1322782..cef2dc2 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2762,7 +2762,6 @@ extern void rtllib_stop_scan(struct rtllib_device *ieee); extern bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan); extern void rtllib_stop_scan_syncro(struct rtllib_device *ieee); extern void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh); -extern u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee); extern void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr); extern void rtllib_sta_wakeup(struct rtllib_device *ieee, short nl); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 067a45a..089a058 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -193,7 +193,7 @@ MgntQuery_TxRateExcludeCCKRates(struct rtllib_device *ieee) return QueryRate; } -u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee) +static u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee) { struct rt_hi_throughput *pHTInfo = ieee->pHTInfo; u8 rate;