From patchwork Mon Jun 23 22:11:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 4405071 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 50CCABEEAA for ; Mon, 23 Jun 2014 22:11:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75C47201F4 for ; Mon, 23 Jun 2014 22:11:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A24B520179 for ; Mon, 23 Jun 2014 22:11:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751210AbaFWWKx (ORCPT ); Mon, 23 Jun 2014 18:10:53 -0400 Received: from mail-we0-f177.google.com ([74.125.82.177]:48301 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbaFWWKw (ORCPT ); Mon, 23 Jun 2014 18:10:52 -0400 Received: by mail-we0-f177.google.com with SMTP id u56so7850020wes.36 for ; Mon, 23 Jun 2014 15:10:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Pk5Qn+MaOWlNFivWQ+vSEEQmrxqBlNZP8ya3UtZvv6M=; b=QPJzoJAbpKYQVrzzP+AcVFuCID6KF8JWj9DlUa4uxFGesrSTIjIQtueoe8M5A0dvDf lw67ZAqYp2mMplYt/DAszp4v7bOehJ4FJqL3lnUNPyg2v0gWQslTG03NwKirn5fU2DIE E71xSWJYub8kQxRUhBcKbCFfC+3xhjtl3kpgwU7fGlVtbDtLaaagXbKRodktOeUZu34q 2HvWJyWGzAv2UnHe/FGe7lF2NaCbp6tjwT1CXlo3PhBdRlDGQMHvHGni2GlsqN0a5NRi 3N6a37rnYUlY9I4WD0VyWGQyx2zXZ4Po/Tma5SjSQX3buN/7nf+zPthEqzdVN0a3495i qmXA== X-Gm-Message-State: ALoCoQmrqI1uo62FQTZRPsA5DyWFHEIACFWQUYI7RbR0i9nZozrkLoNeZc++A4PRKpUJHQsZrCuM X-Received: by 10.194.92.148 with SMTP id cm20mr31571166wjb.57.1403561451318; Mon, 23 Jun 2014 15:10:51 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id bq7sm37212876wib.7.2014.06.23.15.10.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2014 15:10:50 -0700 (PDT) From: Rickard Strandqvist To: Greg Kroah-Hartman , Larry Finger Cc: Rickard Strandqvist , Chaoming Li , Ben Hutchings , Peter Wu , Mark Cave-Ayland , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv3 6/6] drivers/staging/rtl8821ae: replace magic number by macro Date: Tue, 24 Jun 2014 00:11:51 +0200 Message-Id: <1403561511-8117-1-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 For consistency with other drivers, replace a magic number by a macro. Signed-off-by: Rickard Strandqvist Reviewed-by: Peter Wu --- drivers/staging/rtl8821ae/rtl8821ae/hw.c | 2 +- drivers/staging/rtl8821ae/rtl8821ae/reg.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rtl8821ae/rtl8821ae/hw.c b/drivers/staging/rtl8821ae/rtl8821ae/hw.c index 1b8583b..1aa1661 100644 --- a/drivers/staging/rtl8821ae/rtl8821ae/hw.c +++ b/drivers/staging/rtl8821ae/rtl8821ae/hw.c @@ -1623,7 +1623,7 @@ static int _rtl8821ae_set_media_status(struct ieee80211_hw *hw, rtl_write_byte(rtlpriv, (MSR), bt_msr); rtlpriv->cfg->ops->led_control(hw, ledaction); - if ((bt_msr & ~0xfc) == MSR_AP) + if ((bt_msr & MSR_MASK) == MSR_AP) rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x00); else rtl_write_byte(rtlpriv, REG_BCNTCFG + 1, 0x66); diff --git a/drivers/staging/rtl8821ae/rtl8821ae/reg.h b/drivers/staging/rtl8821ae/rtl8821ae/reg.h index beffb42..4cb3ca9 100644 --- a/drivers/staging/rtl8821ae/rtl8821ae/reg.h +++ b/drivers/staging/rtl8821ae/rtl8821ae/reg.h @@ -431,6 +431,7 @@ #define MSR_ADHOC 0x01 #define MSR_INFRA 0x02 #define MSR_AP 0x03 +#define MSR_MASK 0x03 #define RRSR_RSC_OFFSET 21 #define RRSR_SHORT_OFFSET 23