From patchwork Fri Mar 20 13:54:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 6056911 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 273A3BF90F for ; Fri, 20 Mar 2015 13:57:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4797D20523 for ; Fri, 20 Mar 2015 13:57:26 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7E23120522 for ; Fri, 20 Mar 2015 13:57:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYxQP-0006mw-RZ; Fri, 20 Mar 2015 13:57:21 +0000 Received: from mail-la0-x236.google.com ([2a00:1450:4010:c03::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYxQH-0006cF-A9 for ath10k@lists.infradead.org; Fri, 20 Mar 2015 13:57:14 +0000 Received: by labjg1 with SMTP id jg1so87650065lab.2 for ; Fri, 20 Mar 2015 06:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A7BgUu6HHnsWxQ38bBn1VboDophtlCOUVOUsStBcK9o=; b=0PxYC3/uNejRFyssYMibuzraevPxcIolDkp1e5LJmVy5koGMKdlh4+QgoWM77z0sav cRGBvlKqw3mzM0GZzFUImaLKzSb5Eoz/ExWbqmH5IumHattmCa5zkd9p5v6spGH982wD zGblF1i6xoZLLMTfzLHbOE/T5ESL7WMG3gW6U= 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:in-reply-to :references; bh=A7BgUu6HHnsWxQ38bBn1VboDophtlCOUVOUsStBcK9o=; b=M0jV+Atrh0/kUvGZ0LHz3maseYJCV6l6ZeAHL0Kr2/eTBuVefohLLm8c7uFgc+6Wgo uIUWXt/fAHAx3shEdSKKsEvbXomdVVCgBP4H8Zw2IdelWZGI/O2AU7jg9mrzCol5uhoD EfdNW55GTwzzkYRT8kSD4qODoHpGeHI4e3xwm5HCFoTEcY9fojRI6kJVgYUWrFbF6L/t dFpEjDLYeA1UNb4pwwi1r2t6MUBgfK7xGdPlYofBdfemsVjyq8v4w6eDu71dkmqdD/0U aWvqTTS2lLW8qRU14PKWYQnZAY6M3qbxHC5hms9QQLX4QWfGNwNZecUhXlpIOahe1kn5 O1TA== X-Gm-Message-State: ALoCoQmoKHvPHlOW/ZVeybnaF90f8qZzkUPO+vxdtm78rDL/GI80PiZ2xw2mS2ve1yipWSKSHHlfFfYfEfYoyCEC/0R6rcybFhr+JSljaDHThFKQVdLHU3lgduIl2/XYTikQPZRX1xGf+lyVUSjXtTeDBBgCE3xdHUo+jZNfxbWQ2FLIL6WpGq0= X-Received: by 10.152.6.163 with SMTP id c3mr72355177laa.69.1426859811228; Fri, 20 Mar 2015 06:56:51 -0700 (PDT) Received: from bob.homerouter.cpe (apn-77-113-71-242.dynamic.gprs.plus.pl. [77.113.71.242]) by mx.google.com with ESMTPSA id us1sm955771lbc.1.2015.03.20.06.56.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 06:56:50 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH 3/9] ath10k: drop RATETAB_ENT macro Date: Fri, 20 Mar 2015 13:54:09 +0000 Message-Id: <1426859655-11797-4-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1426859655-11797-1-git-send-email-michal.kazior@tieto.com> References: <1426859655-11797-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150320_065713_554989_BA4F9EA1 X-CRM114-Status: UNSURE ( 7.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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 It was superfluous and confusing. It's better to define the structure explicitly. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 5721196..f4e76e7 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -34,27 +34,22 @@ /* Rates */ /*********/ -#define RATETAB_ENT(_rate, _rateid, _flags) { \ - .bitrate = (_rate), \ - .flags = (_flags), \ - .hw_value = (_rateid), \ -} - static struct ieee80211_rate ath10k_rates[] = { /* CCK */ - RATETAB_ENT(10, 0, 0), - RATETAB_ENT(20, 0, 0), - RATETAB_ENT(55, 0, 0), - RATETAB_ENT(110, 0, 0), + { .bitrate = 10 }, + { .bitrate = 20 }, + { .bitrate = 55 }, + { .bitrate = 110 }, + /* OFDM */ - RATETAB_ENT(60, 0, 0), - RATETAB_ENT(90, 0, 0), - RATETAB_ENT(120, 0, 0), - RATETAB_ENT(180, 0, 0), - RATETAB_ENT(240, 0, 0), - RATETAB_ENT(360, 0, 0), - RATETAB_ENT(480, 0, 0), - RATETAB_ENT(540, 0, 0), + { .bitrate = 60 }, + { .bitrate = 90 }, + { .bitrate = 120 }, + { .bitrate = 180 }, + { .bitrate = 240 }, + { .bitrate = 360 }, + { .bitrate = 480 }, + { .bitrate = 540 }, }; #define ath10k_a_rates (ath10k_rates + 4)