Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp409585pxy; Fri, 30 Apr 2021 08:00:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEk+Dpl8vZJK7i9xQxnIFaRZERTMloyJPNgrpi+3kOTlgu0BxNxK0v2Csa2rdOFtVY7K9j X-Received: by 2002:aa7:c9cf:: with SMTP id i15mr6644682edt.4.1619794818770; Fri, 30 Apr 2021 08:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619794818; cv=none; d=google.com; s=arc-20160816; b=SX7hfXyW4zUGfQLJzIGBKL4OADkeuyqeFETKWTNbPr0u9VAI7oMwNXmOzRhe+GSq8F vLLUH3x6kj9lQMiBNiPGrB/T52m1EnePsvKgFM/MaJjCY4tldPC+/PqdJLvrk7dkH4iy 4x9x96Ltw8rO71quZ6gFImTVXmFFN7+Nfb+uZnLcmSdDa5NTULbwJZrgUDrKOTpSdd0Y DxluIGJyTXKAyd/GB28J8SMaKvzm+LDapl4afi+p/Jn9MpZq4jsGMLc2Hg5rAVgHJ88W GsumOCt/M3NnFQwdpbPGhH79G+0CiPI1q5XdiXh1VkuIPKJPUkgBhdUUrtYJ4DU9Tq+w dnsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=auqmHaougiorEJiold25Fwbfcoe9phFoSmF9xCEzReU=; b=kbc+yA9qwZDwTypK8c9Ee63Fgct6jcX5e8j/8y9uZJ6csZGAAYEH4iO131ffjOkh2a iUr6kUqogwJ08uGxZGPWrcxb+j6Yo4JWt/syKVteDHPwhT3WEDT2NilDk8v0hOs2fwZF LHC6kf0BZYP+KKdLbOV/nweGj3ZI7tOx//YrQJs7wt+DnhmtOv/qQqr9mX6HR9BBpiEc bgU87OUDOVNs5raEgVgTyk9siwsWD4zNquXoBF56HbaJ2o7AUZ/57YV2muMNOpUjEome ycZ3Btj5slkaA34nQghyWfVZHtxauqw6S1ULIDLXlcMEO/qK97k5KuzhFt/31/KanYAf Ps3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=kILlZF3J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qc21si3500932ejb.190.2021.04.30.07.59.52; Fri, 30 Apr 2021 08:00:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=kILlZF3J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230418AbhD3O7B (ORCPT + 99 others); Fri, 30 Apr 2021 10:59:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231185AbhD3O6c (ORCPT ); Fri, 30 Apr 2021 10:58:32 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80807C061347 for ; Fri, 30 Apr 2021 07:57:43 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id g14so23291732edy.6 for ; Fri, 30 Apr 2021 07:57:43 -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=auqmHaougiorEJiold25Fwbfcoe9phFoSmF9xCEzReU=; b=kILlZF3JkAYiT8+cq3igucLG8UBqezgW0iQ+w/CglQ6kufyaFYg/7MTbwgQ4wkoBxu DsiDuFTIhGFrgXXqLgXvI6BLU42HCfuw9jHhKwcjiVUNQZ7BntolIQlgZ0hLF9vrCrZn bUNZKxTvZ6FhK/+kK36uywVkjMHubD5Toh1pkORubegvWP0lCqAmxej868xhKh/HzYQm 9PqY3CNen1obThxXPuYf4KTcHfBCbqR0cozG3vKrQ8gNcHsl6EQgByNfXlm+h9ZgRBm7 mm1eYeZLor+gPhbmZ7OV/mYVljhtgtGXj1V22remNWUddJLrGjyd8i5nF3Y84/EW88Vj 3zZA== 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=auqmHaougiorEJiold25Fwbfcoe9phFoSmF9xCEzReU=; b=rqEt5Kd9jCE6wVmV0d7L5Is5C2o+GemlfavSey7FRVo82tUTJ//TbjQbAg4nI2dgMX 0ei5zvSBx159h5KUYp1L8BQZPFTIX4PqMAz0GEubxAiG5zd9S85i/y9t5bF6sp8KojIY 7Ep58n2gT76m0W0wzIHh3e9iMzFcdsYwuZazbm79+M5Xz8eQoVnoHT/EVaJTPgh2+KHk yFxWyazqtPliN/d+GGPch6iPMqIW8j8P8q13CiVBjboYC9y6rjSapKIET48UsH6GcT2M WTIrzE9EruiI4NTUebu2uu+/NSEUIILhl0dHIC7ntqpSw1VGjdNdbzMo3wz0f1ZlZJDf +KfA== X-Gm-Message-State: AOAM531O0c9D8IGpSo2PRIzUp5E9wGCg1cTAz7OV5tBfgjOXgDkgOGay 4mKG6KVEJ9vRycKoTXtpMu1lZCFqiKU= X-Received: by 2002:a05:6402:1cc1:: with SMTP id ds1mr6272454edb.135.1619794661855; Fri, 30 Apr 2021 07:57:41 -0700 (PDT) Received: from agape ([109.52.244.36]) by smtp.gmail.com with ESMTPSA id h15sm2058466ejs.72.2021.04.30.07.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 07:57:41 -0700 (PDT) From: Fabio Aiuto To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3 21/43] staging: rtl8723bs: remove empty if-else blocks after BTC_PRINT removal Date: Fri, 30 Apr 2021 16:56:43 +0200 Message-Id: <102455368fa9535dc78584d7d24cd12ee4160737.1619794331.git.fabioaiuto83@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org remove if-else blocks left empty after BTC_PRINT removal. Signed-off-by: Fabio Aiuto --- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 16 +--------------- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 12 +----------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c index 28f41a637c96..57579d7eab71 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c @@ -606,8 +606,7 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { - if (bBtHsOn) { - } else { + if (!bBtHsOn) { algorithm = BT_8723B_1ANT_COEX_ALGO_PANEDR_HID; } } @@ -1063,10 +1062,6 @@ static void halbtc8723b1ant_PsTdma( pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy); - if (pCoexDm->bCurPsTdmaOn) { - } else { - } - if (!bForceExec) { if ( (pCoexDm->bPrePsTdmaOn == pCoexDm->bCurPsTdmaOn) && @@ -1373,10 +1368,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) bCommon = true; } else { - if (bWifiBusy) { - } else { - } - bCommon = false; } @@ -1528,7 +1519,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl( halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, 1); pCoexDm->psTdmaDuAdjType = 1; } - } else { /* no change */ } if ( @@ -3012,10 +3002,6 @@ void EXhalbtc8723b1ant_BtInfoNotify( pCoexSta->btInfoC2h[rspSource][i] = tmpBuf[i]; if (i == 1) btInfo = tmpBuf[i]; - if (i == length - 1) - {} - else - {} } if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rspSource) { diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c index 73f1cc6bc27c..15304feb2442 100644 --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c @@ -1621,8 +1621,7 @@ static void halbtc8723b2ant_TdmaDurationAdjust( if (!bScan && !bLink && !bRoam) halbtc8723b2ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, pCoexDm->psTdmaDuAdjType); - else { - } + } } @@ -2859,10 +2858,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type u8 wifiCentralChnl; u8 apNum = 0; - if (BTC_MEDIA_CONNECT == type) { - } else { - } - /* only 2.4G we need to inform bt the chnl mask */ pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL, &wifiCentralChnl); if ((BTC_MEDIA_CONNECT == type) && (wifiCentralChnl <= 14)) { @@ -2889,8 +2884,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type void EXhalbtc8723b2ant_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 type) { - if (type == BTC_PACKET_DHCP) { - } } void EXhalbtc8723b2ant_BtInfoNotify( @@ -2915,9 +2908,6 @@ void EXhalbtc8723b2ant_BtInfoNotify( if (i == 1) btInfo = tmpBuf[i]; - if (i == length - 1) { - } else { - } } if (pBtCoexist->bManualControl) { -- 2.20.1