From patchwork Sat Aug 25 10:40:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10576097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 72BEE109C for ; Sat, 25 Aug 2018 10:41:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62AE82AE30 for ; Sat, 25 Aug 2018 10:41:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56E9C2AF1F; Sat, 25 Aug 2018 10:41:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 01D042AE30 for ; Sat, 25 Aug 2018 10:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=mErCe/RWW8rcCdJHuB4/l0+TkSl4QO7L5lY9BdEuPgA=; b=N1G FZgMXvgQATbad41oCRtYdcFIxfqjmsnHNVHYNtIZ8cR5VCemA66aAVXje5KMK1JP7ijx1ruHHBldF ALlkqtUXp13OqIQvtuwjbjyi8a9such1fcEfBopu3HS9VQt+jtnW/WHpgqaMZ+eIrv+eRopNAhpO4 CbhgdBIIvyhsuKzII3hQRskb4pTq+pH6OVoFxX5hsylS6Dsv7EHnNBKxSAgoGaXvemy7AjJMb2hDu dgjrPuuZ9hgxPtelfwfbjoWzlicQFvQDc5xVR8/hN0Pub6SbD1rX7RRsRan2JozlrAz8VaYYdXSBb kOaFRY8uKrE/oWq1Ees6l51vJ4GCeiQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ftW0W-00053E-TZ for patchwork-linux-mediatek@patchwork.kernel.org; Sat, 25 Aug 2018 10:41:28 +0000 Received: from mail-wr1-f65.google.com ([209.85.221.65]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ftW0I-0004vG-RW for linux-mediatek@lists.infradead.org; Sat, 25 Aug 2018 10:41:19 +0000 Received: by mail-wr1-f65.google.com with SMTP id z96-v6so9446019wrb.8 for ; Sat, 25 Aug 2018 03:41:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CcnPklmROzl1quW51pHcm/43LmaYboCrl835RGLsu0g=; b=hq6b7MrH6dNAbjH0/hW4POHFoHeTaZHUmUOmlSY8H0b5pfT3+7pibqPlwBkXaoOUIm kc5NPMNxh23KcYyhcpAwKCYAz341e5S3Zps0Xtq0BCPmfP9Nm7DYif2CK449T17wh90T z51DTC0b29gVtVgx7sacV+0suePrTj+eBt0EivzOpd2QsuN6P3iP1Q9WBAvoIqHoqHSG a0EHwHM2jE/pjNosmuvMQmZQU/p3eiNKvTSZzpQcAUmW8GRwHQ0lNwN7CiS3G2HhBXG2 DcmHa6m+aTgk8MCTLngZLML4J6iyg5vUAMcLiN5tdSt4OJrrtlPFBFzqFaB6q4/9IerF YHnQ== X-Gm-Message-State: APzg51DSWAVsGWX6pFJUk63//7nvlKFQhimDxez7fgwD6l/GeeCSCd1/ S6oLcR80UTPqtT3Fst+jPnlc1H3Msbo= X-Google-Smtp-Source: ANB0VdZQl9h9XLd25XmurZwUgi0w6zAyrcXKiHJNgx8KOZmm6m2fRe5D/r7eDPCngyXLRwNprduApQ== X-Received: by 2002:a5d:61c1:: with SMTP id q1-v6mr3749500wrv.33.1535193662949; Sat, 25 Aug 2018 03:41:02 -0700 (PDT) Received: from localhost.localdomain ([151.66.53.29]) by smtp.gmail.com with ESMTPSA id l18-v6sm16391708wru.75.2018.08.25.03.41.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Aug 2018 03:41:02 -0700 (PDT) From: Lorenzo Bianconi To: nbd@nbd.name Subject: [PATCH 01/16] mt76: move mt76_reg_pair definition in mt76.h Date: Sat, 25 Aug 2018 12:40:41 +0200 Message-Id: <20180825104056.9130-2-lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.18.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180825_034114_900553_67E239BB X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org, sgruszka@redhat.com MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move common definition of mt76_reg_pair in mt76.h and remove duplicated code in mt76x2_init_common.c Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt76.h | 5 +++++ drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h | 5 ----- .../net/wireless/mediatek/mt76/mt76x2_init_common.c | 11 +++-------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index b02b4191ef37..fc27260080af 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -53,6 +53,11 @@ enum mt76_txq_id { __MT_TXQ_MAX }; +struct mt76_reg_pair { + u32 reg; + u32 value; +}; + enum mt76_rxq_id { MT_RXQ_MAIN, MT_RXQ_MCU, diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h index 12f3dd1cc405..a694cc46fac8 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h @@ -219,11 +219,6 @@ struct mt76x0_wcid { u8 tx_rate_nss; }; -struct mt76_reg_pair { - u32 reg; - u32 value; -}; - struct mt76x0_rxwi; extern const struct ieee80211_ops mt76x0_ops; diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c index 953effec8c1a..6af26350c177 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c @@ -47,11 +47,6 @@ struct ieee80211_rate mt76x2_rates[] = { }; EXPORT_SYMBOL_GPL(mt76x2_rates); -struct mt76x2_reg_pair { - u32 reg; - u32 value; -}; - static void mt76x2_set_wlan_state(struct mt76x2_dev *dev, bool enable) { @@ -93,7 +88,7 @@ EXPORT_SYMBOL_GPL(mt76x2_reset_wlan); static void mt76x2_write_reg_pairs(struct mt76x2_dev *dev, - const struct mt76x2_reg_pair *data, int len) + const struct mt76_reg_pair *data, int len) { while (len > 0) { mt76_wr(dev, data->reg, data->value); @@ -128,7 +123,7 @@ void mt76_write_mac_initvals(struct mt76x2_dev *dev) FIELD_PREP(MT_PROT_CFG_NAV, 1) | \ FIELD_PREP(MT_PROT_CFG_TXOP_ALLOW, 0x3f)) - static const struct mt76x2_reg_pair vals[] = { + static const struct mt76_reg_pair vals[] = { /* Copied from MediaTek reference source */ { MT_PBF_SYS_CTRL, 0x00080c00 }, { MT_PBF_CFG, 0x1efebcff }, @@ -184,7 +179,7 @@ void mt76_write_mac_initvals(struct mt76x2_dev *dev) { MT_PROT_AUTO_TX_CFG, 0x00830083 }, { MT_HT_CTRL_CFG, 0x000001ff }, }; - struct mt76x2_reg_pair prot_vals[] = { + struct mt76_reg_pair prot_vals[] = { { MT_CCK_PROT_CFG, DEFAULT_PROT_CFG_CCK }, { MT_OFDM_PROT_CFG, DEFAULT_PROT_CFG_OFDM }, { MT_MM20_PROT_CFG, DEFAULT_PROT_CFG_20 },