From patchwork Thu Mar 20 18:52:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Wu X-Patchwork-Id: 3867391 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E4682BF540 for ; Thu, 20 Mar 2014 18:52:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 030E2201ED for ; Thu, 20 Mar 2014 18:52:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E7CFC201FB for ; Thu, 20 Mar 2014 18:52:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757951AbaCTSwq (ORCPT ); Thu, 20 Mar 2014 14:52:46 -0400 Received: from lekensteyn.nl ([178.21.112.251]:32948 "EHLO lekensteyn.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759340AbaCTSwo (ORCPT ); Thu, 20 Mar 2014 14:52:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lekensteyn.nl; s=s2048-2014-q1; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=sfqPDLCeszDrk+T38i0GY7M9gY3FY99A7z0bNFIX9PQ=; b=jdGLNyPIK0CRYBqNoSugttuUelF+vteNoTsYvK4k9FMKpn+gK72FCv37tU1+7EOne+PZ3XnmHgBpgf9m5KdySJ3hvPMchIRFhIkRrOyZ/sB3h+pidpyLcR4v5FLCnuayVtFzjZHKVm8xKWjAIxUdxeBZ1TKMEBLV7XacRGrTSi6JybDyrmUS9wZsjAH6ixeDcEL9GGzA4dlbK5+U97IQOQVz96Iv/wqvXjwDupk7juX6kMGXifprjwz5BhrPsGX6riite5LXwmgF+M84QzBG6Du+rWb6dreOXOn9uuapbWWKCnEN4a3EO0XIX+sc2BPeEUefp4WuEtUUc5sjnLhM6w==; Received: from ip4da018ae.direct-adsl.nl ([77.160.24.174] helo=localhost.localdomain) by lekensteyn.nl with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1WQi4q-0000q2-TU; Thu, 20 Mar 2014 19:52:28 +0100 From: Peter Wu To: Larry Finger , John W Linville , Greg Kroah-Hartman Cc: Chaoming_Li , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, lekensteyn@gmail.com Subject: [PATCH 2/3] staging/rtl8821ae: avoid accessing RCR directly Date: Thu, 20 Mar 2014 19:52:23 +0100 Message-Id: <1395341544-21464-3-git-send-email-peter@lekensteyn.nl> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1395341544-21464-1-git-send-email-peter@lekensteyn.nl> References: <1395341544-21464-1-git-send-email-peter@lekensteyn.nl> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Similar to "rtlwifi: avoid accessing RCR directly", this patch avoids accessing receive_config directly and uses get_hw_reg. There is no functional change. Signed-off-by: Peter Wu --- drivers/staging/rtl8821ae/rtl8821ae/hw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8821ae/rtl8821ae/hw.c b/drivers/staging/rtl8821ae/rtl8821ae/hw.c index 5ed7a11..e4dbf05 100644 --- a/drivers/staging/rtl8821ae/rtl8821ae/hw.c +++ b/drivers/staging/rtl8821ae/rtl8821ae/hw.c @@ -1633,12 +1633,13 @@ static int _rtl8821ae_set_media_status(struct ieee80211_hw *hw, void rtl8821ae_set_check_bssid(struct ieee80211_hw *hw, bool check_bssid) { struct rtl_priv *rtlpriv = rtl_priv(hw); - struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); - u32 reg_rcr = rtlpci->receive_config; + u32 reg_rcr; if (rtlpriv->psc.rfpwr_state != ERFON) return; + rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RCR, (u8 *)(®_rcr)); + if (check_bssid == true) { reg_rcr |= (RCR_CBSSID_DATA | RCR_CBSSID_BCN); rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_RCR,