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: 6056811 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 167A19F318 for ; Fri, 20 Mar 2015 13:57:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FA9420528 for ; Fri, 20 Mar 2015 13:57:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 992D720523 for ; Fri, 20 Mar 2015 13:57:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752367AbbCTN4y (ORCPT ); Fri, 20 Mar 2015 09:56:54 -0400 Received: from mail-la0-f53.google.com ([209.85.215.53]:36228 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752243AbbCTN4w (ORCPT ); Fri, 20 Mar 2015 09:56:52 -0400 Received: by labe2 with SMTP id e2so12274022lab.3 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=hO4HD+d3+H9rJXttykLLjcXkQGpjqbmvzoP5tJexC8/BwgfGmkNcqpduIvs+HU6VYE 9Dz0LTjnGElUfbeweLXAkP5NVGar4jSWLT+TEOiCfv35mKlUaNjwcdGLYdSoxkXOSMKp kTfrFDtOPWRw+mw/SgVsY7dP030fLHQZITLS5n3kNQKpSaejlxCIIKSyiLosocoo4U1m xP359tGfYpVUFIsiomVyPMpfSqAHtJLTiHenSup127rmtoAnYwkWu4+Jq4t2ssSBiuXV kBuFhbBeSm5qQzkLg/TPWNACHWbLHUuPJrAOCQiCf9faj/2E6M4jkJ17DaUjADzu8lAc JFAA== X-Gm-Message-State: ALoCoQl3rBjHTufBPeRRs9NodGXBtNhZ4Q6U2ijwON8sKoYah9KC6+Z7iuWfCYyjMVAwCh+XCfYfpRvSro3c/yZ2SlNmngKFQiXjrPKa4HzmIsgghME8qlCZGbZqfnkNwAJ2TIVabBUe 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 Cc: linux-wireless@vger.kernel.org, Michal Kazior 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 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 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)