From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAA816D00 for ; Sat, 10 Apr 2021 14:21:19 +0000 (UTC) Received: by mail-ed1-f51.google.com with SMTP id f8so9782982edd.11 for ; Sat, 10 Apr 2021 07:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KH662KAlap1QpCcmNJTm3ptVnk0anldAtalYzgkYKck=; b=t4YRtEi5AXIII2TAC+6ufPO0Rj/DHpue0eANEtN7GtpWiJ768LGX4nj3fX/Zbcj94/ 0tWdN2fsHTx/FGNnSIptqSWnO36lbVSGK+pghJteKtLMFA8ihG1DZ81UV5Z5cKq9vEKB m4Pm6qb4ca9zPh+JdLoYKrgG8+VdRFGJYT0wcb7R6SxW830daVg3ii4FeyIl1P1AkSzp LnzXk9ifCcrfJxFOv5kRGDoSqCH84u18FI6n3k2dtwH/AeDEB9hvjji0ipF+CWRCrZnK 9V9L5DkK1tqBh+6hqhZefD5J7khSBLtzu3h0lLhCBq6cd+l/AIoWM3cq2i2fKDoDCGCP oIxA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=KH662KAlap1QpCcmNJTm3ptVnk0anldAtalYzgkYKck=; b=fUNbeNqr6VlKY0iiagrFDW2d+ITDHUBgadtDEYfnw9Tx+XHPTnBbz99pTijEumX9BS ghxkDEw54ygSiyPiv8ohG+z8b8Ywdwd/w29u4AShkNg1+D7AhR9Fx/svUkITWvneCwv/ pESJtA6WSK1xotp8tF9Efr6VvLzooeeCefZcKZ9iULMHKfaTGkeh/hamB/fkWdWVByTt MmpNPyjx7z+TLTd0CnxQwZ9ZSj9b4ih7nwVAON1HWcJvoXTQWjuD3SHYcA6I+smFzK77 RzJgA+KSvN3VGyCdTfYZWrOFueetO8LiuB2HUEBmgFWtFjMB1dKV0zvjXN+Bx064DhuK NfmA== X-Gm-Message-State: AOAM533n0R0xxrhcxdtdau2wcyniV0nx5hftyH0HnfUSXpUhk+Rw8JvU tvoG9TimDiO/jrVMv1NWR4M= X-Google-Smtp-Source: ABdhPJwuOEYys8mFTM6rRQZqKi30EbCt45//9AikiRQIQbh142r6kBKIshF/BWu1FY4D2UkfTIBnZw== X-Received: by 2002:a05:6402:1350:: with SMTP id y16mr21772951edw.309.1618064478362; Sat, 10 Apr 2021 07:21:18 -0700 (PDT) Received: from agape ([5.171.81.28]) by smtp.gmail.com with ESMTPSA id x17sm2698593ejd.68.2021.04.10.07.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Apr 2021 07:21:18 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 24/25] staging: rtl8723bs: remove more unnecessary parentheses Date: Sat, 10 Apr 2021 16:20:37 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit remove more unnecessary parentheses after DBG_8192C deletion. Signed-off-by: Fabio Aiuto --- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 21 ++++++++----------- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 4 ++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 6bf0cbb17b99..8d6ea8850556 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -754,9 +754,8 @@ static void hal_ReadEFuse_WiFi( while (AVAILABLE_EFUSE_ADDR(eFuse_Addr)) { efuse_OneByteRead(padapter, eFuse_Addr++, &efuseHeader, bPseudoTest); - if (efuseHeader == 0xFF) { + if (efuseHeader == 0xFF) break; - } /* Check PG header for section num. */ if (EXT_HEADER(efuseHeader)) { /* extended header */ @@ -1319,9 +1318,9 @@ static u8 hal_EfusePgCheckAvailableAddr( EFUSE_GetEfuseDefinition(padapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, &max_available, bPseudoTest); current_size = Efuse_GetCurrentSize(padapter, efuseType, bPseudoTest); - if (current_size >= max_available) { + if (current_size >= max_available) return false; - } + return true; } @@ -1469,14 +1468,13 @@ static u8 hal_EfusePgPacketWrite1ByteHeader( efuse_OneByteRead(padapter, efuse_addr, &tmp_header, bPseudoTest); if (tmp_header != 0xFF) break; - if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { + if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) return false; - } + } while (1); - if (tmp_header != pg_header) { + if (tmp_header != pg_header) return false; - } *pAddr = efuse_addr; @@ -1498,9 +1496,8 @@ static u8 hal_EfusePgPacketWrite2ByteHeader( EFUSE_GetEfuseDefinition(padapter, efuseType, TYPE_AVAILABLE_EFUSE_BYTES_BANK, &efuse_max_available_len, bPseudoTest); efuse_addr = *pAddr; - if (efuse_addr >= efuse_max_available_len) { + if (efuse_addr >= efuse_max_available_len) return false; - } pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F; @@ -3734,9 +3731,9 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val) case HW_VAR_MACID_SLEEP: /* Input is MACID */ val32 = *(u32 *)val; - if (val32 > 31) { + if (val32 > 31) break; - } + val8 = (u8)val32; /* macid is between 0~31 */ val32 = rtw_read32(padapter, REG_MACID_SLEEP); diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c index a69cc24c81c7..7c2680b6508c 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c @@ -123,9 +123,9 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe, pstapriv = &padapter->stapriv; psta = rtw_get_stainfo(pstapriv, sa); - if (psta) { + if (psta) pkt_info.station_id = psta->mac_id; - } + pkt_info.data_rate = pattrib->data_rate; /* rtl8723b_query_rx_phy_status(precvframe, pphy_status); */ -- 2.20.1