From patchwork Tue Nov 13 17:28:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 1735811 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2D236DF280 for ; Tue, 13 Nov 2012 17:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755459Ab2KMR3U (ORCPT ); Tue, 13 Nov 2012 12:29:20 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:36456 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755425Ab2KMR3N (ORCPT ); Tue, 13 Nov 2012 12:29:13 -0500 Received: by mail-ee0-f46.google.com with SMTP id b15so4133294eek.19 for ; Tue, 13 Nov 2012 09:29:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=7tM2ezsB9FZcdPRy45+Ls2cVlmujQJMLddH4/jdkTqA=; b=HIk+KVmRcLxtBxJZ7bSe/Gem0esGqh8ODuD30mNke5PvD3iz1kiYF7n1kdKYpautjn u24G2FvZKh8uC7kVG1vd0a06CQD8Uw/4xj5XbacIbKk71nQ73kXdNUIZoRdKSLfsfwHe YqHKStT+/hw1Ik1r/BFaLbPoADWoraOmbMMp5o91D9+AU2FkOer4KNWhlyB2Jb/F8hrI 2mzpr8lRNzUA4WAcY+SZ0pvsaCg6dbyLZYs5A637t4SYeA85mclHrZSkZUL5Ql8zrnqA iufCFRnnHW8NttcHPXvsM9H7jdIJK5G3NZK9YUpvxWTZYlWdO3jP6i14Ihd9ufcnLTRr DTZw== Received: by 10.14.173.67 with SMTP id u43mr77299361eel.27.1352827752705; Tue, 13 Nov 2012 09:29:12 -0800 (PST) Received: from laptop.olymp.linuxd.org (78-22-179-94.pool.ukrtel.net. [94.179.22.78]) by mx.google.com with ESMTPS id 42sm23845800eee.0.2012.11.13.09.29.10 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Nov 2012 09:29:12 -0800 (PST) From: Maxim Mikityanskiy To: greg@kroah.com, Larry.Finger@lwfinger.net, linux-wireless@vger.kernel.org Cc: Maxim Mikityanskiy Subject: [PATCH 13/17] staging: rtl8187se: Use ARRAY_SIZE instead of in-code constants Date: Tue, 13 Nov 2012 19:28:19 +0200 Message-Id: <1352827703-4659-14-git-send-email-maxtram95@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352827703-4659-1-git-send-email-maxtram95@gmail.com> References: <1352827703-4659-1-git-send-email-maxtram95@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Use ARRAY_SIZE macro instead of hardcoding array size into loop condition and remove unused last item of rtl8225z2_rxgain[] Signed-off-by: Maxim Mikityanskiy --- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c index eba9786..c592f79 100644 --- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c +++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c @@ -132,7 +132,7 @@ static const u16 rtl8225z2_rxgain[] = { 0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d, 0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9, 0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3, - 0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb + 0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb }; @@ -431,8 +431,8 @@ void rtl8225z2_rf_init(struct net_device *dev) struct r8180_priv *priv = ieee80211_priv(dev); int i; short channel = 1; - u16 brsr; - u32 data, addr; + u16 brsr; + u32 data; priv->chan = channel; @@ -473,8 +473,8 @@ void rtl8225z2_rf_init(struct net_device *dev) write_rtl8225(dev, 0x0, 0x1b7); - for (i = 0; i < 95; i++) { - write_rtl8225(dev, 0x1, (u8)(i + 1)); + for (i = 0; i < ARRAY_SIZE(rtl8225z2_rxgain); i++) { + write_rtl8225(dev, 0x1, i + 1); write_rtl8225(dev, 0x2, rtl8225z2_rxgain[i]); } @@ -504,14 +504,12 @@ void rtl8225z2_rf_init(struct net_device *dev) write_rtl8225(dev, 0x0, 0x2bf); - for (i = 0; i < 128; i++) { - data = rtl8225_agc[i]; - - addr = i + 0x80; /* enable writing AGC table */ - write_phy_ofdm(dev, 0xb, data); + for (i = 0; i < ARRAY_SIZE(rtl8225_agc); i++) { + write_phy_ofdm(dev, 0xb, rtl8225_agc[i]); mdelay(1); - write_phy_ofdm(dev, 0xa, addr); + /* enable writing AGC table */ + write_phy_ofdm(dev, 0xa, i + 0x80); mdelay(1); }