From patchwork Mon Jun 23 22:05:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 4405011 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 88FD4BEEAA for ; Mon, 23 Jun 2014 22:04:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A343D20136 for ; Mon, 23 Jun 2014 22:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A737C200D7 for ; Mon, 23 Jun 2014 22:04:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753887AbaFWWEZ (ORCPT ); Mon, 23 Jun 2014 18:04:25 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:59619 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751798AbaFWWEY (ORCPT ); Mon, 23 Jun 2014 18:04:24 -0400 Received: by mail-wi0-f177.google.com with SMTP id r20so4882831wiv.4 for ; Mon, 23 Jun 2014 15:04:23 -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=fWDdp64TTMF5PDv0RSaQ6whkVHHXHRaPnga121JTJFI=; b=ayMCA/4sNV1rQ+vZOQXxU8MsXBoKM1UpaplsNSTSN15hVWs5+jYuoLc46m/qJl/IAR BEUPS1E7gAmLSrzf42RlX479lDwjNnCK/BFZvWz16r4/QUsJVeivv+ZfhNPRkcb2+b72 0BCWo9DWkC9CwDOqFuRlhS1LN0PyN0jAJcttnuyr/3djXaj7EHq4TYDJTKSev23lZwCM 2m+5r8LO0Wr2mVkfM+ON3PvtJQ8mnH1G7ktEm/zkCk8TfVDbIY+q6/Q/CmV9MpZCwsV3 0vNEtIwkuAKtrjuAf7N98b8VrWpyHKI5VKYoK4k3ZRXeJ9YjiMpfjH0kWbDfxUyEIrRW SvgQ== X-Gm-Message-State: ALoCoQnH4VSm3Pfbz5VZR67foMhR9VEex0hu4uUV2agHnhTAXHZkN0+M7J8ox65nlWyajap4n2Nz X-Received: by 10.180.99.166 with SMTP id er6mr29195952wib.48.1403561063368; Mon, 23 Jun 2014 15:04:23 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id wu6sm39003623wjb.46.2014.06.23.15.04.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jun 2014 15:04:22 -0700 (PDT) From: Rickard Strandqvist To: Larry Finger , Chaoming Li Cc: Rickard Strandqvist , "John W. Linville" , Ben Hutchings , Peter Wu , Mark Cave-Ayland , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv3 4/6] rtlwifi/rtl8723ae: Replace magic number by macro Date: Tue, 24 Jun 2014 00:05:24 +0200 Message-Id: <1403561124-7889-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/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +- drivers/net/wireless/rtlwifi/rtl8723ae/reg.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c index 65c9e80..8f50ace 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c @@ -1109,7 +1109,7 @@ static int _rtl8723ae_set_media_status(struct ieee80211_hw *hw, rtl_write_byte(rtlpriv, (MSR), bt_msr); rtlpriv->cfg->ops->led_control(hw, ledaction); - if ((bt_msr & 0x03) == 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/net/wireless/rtlwifi/rtl8723ae/reg.h b/drivers/net/wireless/rtlwifi/rtl8723ae/reg.h index 64376b3..ce2c66f 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/reg.h +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/reg.h @@ -361,6 +361,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