From patchwork Tue Oct 20 06:45:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 7442121 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 D0D149F36A for ; Tue, 20 Oct 2015 06:46:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03D0F2082D for ; Tue, 20 Oct 2015 06:46:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D58E2082B for ; Tue, 20 Oct 2015 06:46:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752202AbbJTGqW (ORCPT ); Tue, 20 Oct 2015 02:46:22 -0400 Received: from mail-lf0-f50.google.com ([209.85.215.50]:34298 "EHLO mail-lf0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751801AbbJTGqU (ORCPT ); Tue, 20 Oct 2015 02:46:20 -0400 Received: by lfaz124 with SMTP id z124so718542lfa.1 for ; Mon, 19 Oct 2015 23:46:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NiEO/E2mpYFor/FCamnjAL2AXtvRPKbR0IvBzetHDy0=; b=n54uS8LVUyQgi0ESqQVO1ViRee+TT7VSd2Haid9+Hwzv3yZLzGMWOyLBx7mj1yt7E/ pk5suvbHz/JY2XMNPRuaHKcTtswKMvSa5kfiXcmUYPxO2rAgWeiMhtI1t0x+M7BUXVQe 6lCJxgaj8ABSZTHdpAHh37PLLRVdo2JVWL4GzM36mmdWLhzGZKDvMebNLkc3wFu5gmF4 gsQrauQ+mDjX6rP8dOrVZS8pqGGbAUmt6lSozmS7ElEqN9W3J3MZelYLOKrmn68OYdPB Oe8khBzZXgKq/tu4F70IYx5lCYSwZXu36JmptGwZRRwnjCnY4IyQ6nbOlLlKBrHN8H3d C2xA== X-Received: by 10.25.28.131 with SMTP id c125mr377820lfc.99.1445323579177; Mon, 19 Oct 2015 23:46:19 -0700 (PDT) Received: from gmail.com (89-74-144-200.dynamic.chello.pl. [89.74.144.200]) by smtp.gmail.com with ESMTPSA id r66sm241157lfd.49.2015.10.19.23.46.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Oct 2015 23:46:18 -0700 (PDT) From: Jakub Sitnicki To: Jes.Sorensen@redhat.com Cc: Larry.Finger@lwfinger.net, linux-wireless@vger.kernel.org, Jakub Sitnicki Subject: [RFC 04/16] rtl8xxxu: Skip disabled efuse words early Date: Tue, 20 Oct 2015 08:45:34 +0200 Message-Id: <1445323546-12807-5-git-send-email-jsitnicki@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1445323546-12807-1-git-send-email-jsitnicki@gmail.com> References: <1445323546-12807-1-git-send-email-jsitnicki@gmail.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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Avoid a negative conditional and an extra level of indentation in the bigger part of the loop body. Signed-off-by: Jakub Sitnicki --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 28 +++++++++++------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c index 79efdc2..cfb18db 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c @@ -2010,22 +2010,20 @@ static int rtl8xxxu_read_efuse(struct rtl8xxxu_priv *priv) } for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) { /* Check word enable condition in the section */ - if (!(word_mask & BIT(i))) { - ret = rtl8xxxu_read_efuse8(priv, - efuse_addr++, - &val8); - if (ret) - goto exit; - priv->efuse_wifi.raw[map_addr++] = val8; - - ret = rtl8xxxu_read_efuse8(priv, - efuse_addr++, - &val8); - if (ret) - goto exit; - priv->efuse_wifi.raw[map_addr++] = val8; - } else + if (word_mask & BIT(i)) { map_addr += 2; + continue; + } + + ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8); + if (ret) + goto exit; + priv->efuse_wifi.raw[map_addr++] = val8; + + ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8); + if (ret) + goto exit; + priv->efuse_wifi.raw[map_addr++] = val8; } }