From nobody Mon Apr 6 09:41:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E9F8C54EE9 for ; Thu, 8 Sep 2022 13:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232179AbiIHNJx (ORCPT ); Thu, 8 Sep 2022 09:09:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231669AbiIHNJo (ORCPT ); Thu, 8 Sep 2022 09:09:44 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E138A13DF7 for ; Thu, 8 Sep 2022 06:09:28 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id u9so37966101ejy.5 for ; Thu, 08 Sep 2022 06:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=UbzD73ANBmIAnFLQ4kLmnJvqIHDS1D6Ssvlro3k6SAc=; b=CCRU87sl0dDdVinCDDVfHoNWtWcAWNbY9lxV4uj/16ArW1D5qzxNp83v0CEgRg3vw0 ppMN/Wrgqb0I1ZIDGu2qCdn/6yvNka5kIo++BJB6r/aIpViFVMWwbwsLpQPMO7J/ezr7 s19OXW8UHZ19vQqBcRPSu+DVLFrmBWKr3DSMkl6oboKOxFYjWJoH6rHpj6z1p8k+qLyi qDkYw192zz9XREv6su1NYNCa1dTU7NGyCVyV1kvXKoFHjmzYdPl79O99/dhrqIsLOi5d GMFItasEEZRm5Xqpon9FdfsJZD0HOCf/G+evRPKXDZqeEhEBxHDn74AyhI+clCIz/BGQ kE1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=UbzD73ANBmIAnFLQ4kLmnJvqIHDS1D6Ssvlro3k6SAc=; b=zjN6j38Wb3+eTXJMQids1pQaKBuJEOJIxiUwRDcTiZ3ImmvpbveiwT41KrB35S0r/Z k7a19gsyTVBojuoRbYFmA4b/+x9Tz8ZuTUwhIeP99ZH2gPq+MnAG2GNEpQWfulVX6FIY O+OjE+JaPVDaBpuDFh/FzvtEmzI0PR7MyPMd7SdQ3r1KwRyM/hMmjkm4D2pjWrfPNB31 s8epSnqXmoFBKQxHjPha2utDLENCO8GHP+Vod2GW4C30BjfIo0GGtvSh1GwXmcfbOHbN CzGvgbgUuf6gSXz7oejwJZjdJX4laLdqQaudV3dj0cXFH+n3YFDwVAlVR0jUhq+oIQq2 wDnA== X-Gm-Message-State: ACgBeo3zjGdTwJf5DrsIk2en+EGtNhttfj/SVI+Dtw5qA5ywk+jCJmG3 yMoZxKzaP+E667VwtgtMbqNkE77/G50= X-Google-Smtp-Source: AA6agR7u46nTrfb6Eb2z+eTVWECtts9/p08dYc2kxgLV8wGg+eN9CO6LeivOA6umOXzrd8Zv62WQ7A== X-Received: by 2002:a17:906:a0d3:b0:73d:be5b:2b52 with SMTP id bh19-20020a170906a0d300b0073dbe5b2b52mr6117358ejb.727.1662642566641; Thu, 08 Sep 2022 06:09:26 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id cf6-20020a0564020b8600b0044edf0a2deasm4847978edb.69.2022.09.08.06.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 06:09:26 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/4] staging: r8188eu: remove unused parameters from _BeaconFunctionEnable() Date: Thu, 8 Sep 2022 15:09:12 +0200 Message-Id: <20220908130915.8406-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220908130915.8406-1-straube.linux@gmail.com> References: <20220908130915.8406-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The parameters 'Enable' and 'Linked' of _BeaconFunctionEnable() are unused. Remove them. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/usb_halinit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 63c5cec655d5..a478b83dcbf3 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -496,8 +496,7 @@ static int _InitBeaconParameters(struct adapter *Adapte= r) return 0; } =20 -static void _BeaconFunctionEnable(struct adapter *Adapter, - bool Enable, bool Linked) +static void _BeaconFunctionEnable(struct adapter *Adapter) { rtw_write8(Adapter, REG_BCN_CTRL, (BIT(4) | BIT(3) | BIT(1))); =20 @@ -1043,7 +1042,7 @@ void SetBeaconRelatedRegisters8188EUsb(struct adapter= *adapt) rtw_write8(adapt, REG_RXTSF_OFFSET_CCK, 0x50); rtw_write8(adapt, REG_RXTSF_OFFSET_OFDM, 0x50); =20 - _BeaconFunctionEnable(adapt, true, true); + _BeaconFunctionEnable(adapt); =20 rtw_resume_tx_beacon(adapt); =20 --=20 2.37.2 From nobody Mon Apr 6 09:41:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3C92C38145 for ; Thu, 8 Sep 2022 13:10:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232192AbiIHNKE (ORCPT ); Thu, 8 Sep 2022 09:10:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231899AbiIHNJp (ORCPT ); Thu, 8 Sep 2022 09:09:45 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E161A13EB7 for ; Thu, 8 Sep 2022 06:09:28 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id dv25so8639453ejb.12 for ; Thu, 08 Sep 2022 06:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=cGFpUSmhQHaWihVu0s0KApe/+KGdqA3knsE2olHsXIk=; b=jh9PzIt2P10qdIEkjsUpIYuzKaPb+lvGRiATn6Wb5NEaXcRM3hJAogEw80jCaQYOGE zqW0dhp97W2U7RDuEBvbn7S5bbPKk7z8Fm3I/SSvzf4IK2vHbf3etwqbSg7k4suELSoA SZDDRPTkgWdb+XBEYwYmNeCreIYkutvO+Tf8NirFDDAPuuOrTj3cl3+bCshQ5LA9EDqV /YF4N9WiMxd10KBPLNvV7+5LQNiruts30dLXuk/DPJOGfiG3tz3nqXNVNVIbvEuDNehQ nTGfjY2PXQTAY8wWjT0rWu+Zf4JcAWHQ6tFqVwvBkaY3o4fhvmH96OPTDyJrgP6QDr3r RM2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=cGFpUSmhQHaWihVu0s0KApe/+KGdqA3knsE2olHsXIk=; b=h+xEKwkSvuFp7dD+4ICvgd96Qm7tSW6mVoMdMZUkSWKrM6eteA4AdjNXnJY/VcxRIl aFLIvROAZph1sBeEhqVU/4vrWS4nco7xA2zokj3NhCktwjSTZEIuR9T2Im497UuU3Xqs mNaBkU8n7LaU3YhbnyG7SA+ji7On7gIw6aArd9mcBrK84HHE05BMVJ9iBHOO+pPD1dNZ oy4tRTGj2QNm+iIAY1B1gcBQYIiHKMuoULgmDgdnxIfxYZ8D4ja7Rq0XuSgPCZdlveoW srJv+5g22rpUFlA05aFz/wakXWkdsdpllIoHxWLF1K70mYNy6a2Xl9I4ZRMUKOtXvLun Do9w== X-Gm-Message-State: ACgBeo0K1WqL4su88pT54/eLhAaMI/xvYv4cWqB+Nn84yTLmztm8aNZf v4gMlKjSxj6IbEJnLZBj2FY= X-Google-Smtp-Source: AA6agR5wjEYXLPTWfEcMIrJUlXxqc2csMgnNhGtg8NOwAomgI/0oEPkMSFv9GejAOxOiI+/2iytfBA== X-Received: by 2002:a17:906:dac3:b0:748:8cbf:3c50 with SMTP id xi3-20020a170906dac300b007488cbf3c50mr5890416ejb.136.1662642567246; Thu, 08 Sep 2022 06:09:27 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id cf6-20020a0564020b8600b0044edf0a2deasm4847978edb.69.2022.09.08.06.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 06:09:26 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/4] staging: r8188eu: remove unused parameter from UpdateBrateTbl() Date: Thu, 8 Sep 2022 15:09:13 +0200 Message-Id: <20220908130915.8406-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220908130915.8406-1-straube.linux@gmail.com> References: <20220908130915.8406-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The parameter 'Adapter' of UpdateBrateTbl() is unused. Remove it. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +- drivers/staging/r8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/r8188eu/include/rtw_mlme_ext.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 893dac30e8e6..ad8bfc29c4ce 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -1409,7 +1409,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, str= uct recv_frame *precv_frame pmlmeinfo->state |=3D WIFI_FW_ASSOC_SUCCESS; =20 /* Update Basic Rate Table for spec, 2010-12-28 , by thomas */ - UpdateBrateTbl(padapter, pmlmeinfo->network.SupportedRates); + UpdateBrateTbl(pmlmeinfo->network.SupportedRates); =20 report_assoc_result: report_join_res(padapter, res); diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 235dbf353802..065ab274b0b4 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -222,7 +222,7 @@ void get_rate_set(struct adapter *padapter, unsigned ch= ar *pbssrate, int *bssrat memcpy(pbssrate, supportedrates, *bssrate_len); } =20 -void UpdateBrateTbl(struct adapter *Adapter, u8 *mbrate) +void UpdateBrateTbl(u8 *mbrate) { u8 i; u8 rate; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index e092e646c0d2..e70640f1e41d 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -393,7 +393,7 @@ extern struct xmit_frame *alloc_mgtxmitframe(struct xmi= t_priv *pxmitpriv); unsigned char networktype_to_raid(unsigned char network_type); u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int l= en); void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *= len); -void UpdateBrateTbl(struct adapter *padapter, u8 *mBratesOS); +void UpdateBrateTbl(u8 *mBratesOS); void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen); =20 void Save_DM_Func_Flag(struct adapter *padapter); --=20 2.37.2 From nobody Mon Apr 6 09:41:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A823C54EE9 for ; Thu, 8 Sep 2022 13:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232198AbiIHNKJ (ORCPT ); Thu, 8 Sep 2022 09:10:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231924AbiIHNJp (ORCPT ); Thu, 8 Sep 2022 09:09:45 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1D0013F0E for ; Thu, 8 Sep 2022 06:09:29 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id go34so2893453ejc.2 for ; Thu, 08 Sep 2022 06:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=bFqxdPA34fBehnbSp3k/mNFHYFTdf2a6bzWDE1HOQiA=; b=M1xjCXfWrc6HNSbMz1Z5Dc85Hyz/AoQ/ZM0MBsn2McqOk4hTpoojCBxbej/jRFyGbs I7LrhNJweCpICR3XrKWTp5mokrPwUXkPRGFVb1etwJdXR6rN9b59Q2cDWgKcq3zdL5qK ICnCpl52/pTXSbiTKHElBJkHT0Rm+o/YNEw2SA3VERlRuIlDc04o0XfkM3uk/oorm5ty grp0tJxSO74Mw/JP3LlBInn1ZMxP7z4O6lUTIx7QZUqN/Ik5ZFOgtxv+OcACpCpdIxGF T1rojMliAgdbwnNMVT6bCFiWPWzNt5LZNMwKX+UElBAI56rzoymJio2dbnetxW2hLPTR cz6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=bFqxdPA34fBehnbSp3k/mNFHYFTdf2a6bzWDE1HOQiA=; b=XT8RfPQJlvWo+6hT1Dra5VxaxoukiCGZYVjL/QjyufRq/gDTY7cYuHFZlHmtBdHqnG 7f/Q69dewD3sMIdEGC0cxpo3HdjK3BC1/4llqFMqwhn+jVrwS9l7eP9CD6Onc1JbpA9a dPDB7Ceobt0Tq/oXIggwyXY3tsSC6BNPEdoBlRCqawyubEpINt0QilfokHjsfCnxNNAW vzICPcroj83gSPQjaUVJUsHS3wM5dOB8x5FDynICy/7wMrLtJqa+Ofj3Vc5FqgqAQ8Zc QeZ7ZrWVr7Q9IfJVlxsmfvtOHp7iWhh09V0o+5DSnYKS0S5e9WJPpIeUZnhXjsNthBHY OawA== X-Gm-Message-State: ACgBeo3hs2PwUxy5YWyS1hUw3bp1aVfFse+7EPVMcw70ADDx9P8ENnJs /eWFWqqnp7agp9yXJbNPEa/VpiPWaQA= X-Google-Smtp-Source: AA6agR7AggqzJ6OW4WbMptOsRrGp+z8wVvemfZdMVRW/PE7dazn1RxQF3O51GGQsuFflQgreDHcZ9A== X-Received: by 2002:a17:907:2da6:b0:730:8b30:e517 with SMTP id gt38-20020a1709072da600b007308b30e517mr5985555ejc.291.1662642567943; Thu, 08 Sep 2022 06:09:27 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id cf6-20020a0564020b8600b0044edf0a2deasm4847978edb.69.2022.09.08.06.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 06:09:27 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/4] staging: r8188eu: make two functions static Date: Thu, 8 Sep 2022 15:09:14 +0200 Message-Id: <20220908130915.8406-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220908130915.8406-1-straube.linux@gmail.com> References: <20220908130915.8406-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The functions UpdateBrateTbl() and UpdateBrateTblForSoftAP() are only used in rtw_mlme_ext.c. Make them static. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 40 +++++++++++++++++++ drivers/staging/r8188eu/core/rtw_wlan_util.c | 40 ------------------- .../staging/r8188eu/include/rtw_mlme_ext.h | 2 - 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index ad8bfc29c4ce..03b1e6ab9053 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -932,6 +932,46 @@ unsigned int OnAuthClient(struct adapter *padapter, st= ruct recv_frame *precv_fra return _FAIL; } =20 +static void UpdateBrateTbl(u8 *mbrate) +{ + u8 i; + u8 rate; + + /* 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */ + for (i =3D 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) { + rate =3D mbrate[i] & 0x7f; + switch (rate) { + case IEEE80211_CCK_RATE_1MB: + case IEEE80211_CCK_RATE_2MB: + case IEEE80211_CCK_RATE_5MB: + case IEEE80211_CCK_RATE_11MB: + case IEEE80211_OFDM_RATE_6MB: + case IEEE80211_OFDM_RATE_12MB: + case IEEE80211_OFDM_RATE_24MB: + mbrate[i] |=3D IEEE80211_BASIC_RATE_MASK; + break; + } + } +} + +static void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen) +{ + u8 i; + u8 rate; + + for (i =3D 0; i < bssratelen; i++) { + rate =3D bssrateset[i] & 0x7f; + switch (rate) { + case IEEE80211_CCK_RATE_1MB: + case IEEE80211_CCK_RATE_2MB: + case IEEE80211_CCK_RATE_5MB: + case IEEE80211_CCK_RATE_11MB: + bssrateset[i] |=3D IEEE80211_BASIC_RATE_MASK; + break; + } + } +} + unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv= _frame) { u16 capab_info; diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index 065ab274b0b4..e50631848cab 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -222,46 +222,6 @@ void get_rate_set(struct adapter *padapter, unsigned c= har *pbssrate, int *bssrat memcpy(pbssrate, supportedrates, *bssrate_len); } =20 -void UpdateBrateTbl(u8 *mbrate) -{ - u8 i; - u8 rate; - - /* 1M, 2M, 5.5M, 11M, 6M, 12M, 24M are mandatory. */ - for (i =3D 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) { - rate =3D mbrate[i] & 0x7f; - switch (rate) { - case IEEE80211_CCK_RATE_1MB: - case IEEE80211_CCK_RATE_2MB: - case IEEE80211_CCK_RATE_5MB: - case IEEE80211_CCK_RATE_11MB: - case IEEE80211_OFDM_RATE_6MB: - case IEEE80211_OFDM_RATE_12MB: - case IEEE80211_OFDM_RATE_24MB: - mbrate[i] |=3D IEEE80211_BASIC_RATE_MASK; - break; - } - } -} - -void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen) -{ - u8 i; - u8 rate; - - for (i =3D 0; i < bssratelen; i++) { - rate =3D bssrateset[i] & 0x7f; - switch (rate) { - case IEEE80211_CCK_RATE_1MB: - case IEEE80211_CCK_RATE_2MB: - case IEEE80211_CCK_RATE_5MB: - case IEEE80211_CCK_RATE_11MB: - bssrateset[i] |=3D IEEE80211_BASIC_RATE_MASK; - break; - } - } -} - void Save_DM_Func_Flag(struct adapter *padapter) { struct hal_data_8188e *haldata =3D &padapter->haldata; diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/stagi= ng/r8188eu/include/rtw_mlme_ext.h index e70640f1e41d..b322d0848db9 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h +++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h @@ -393,8 +393,6 @@ extern struct xmit_frame *alloc_mgtxmitframe(struct xmi= t_priv *pxmitpriv); unsigned char networktype_to_raid(unsigned char network_type); u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int l= en); void get_rate_set(struct adapter *padapter, unsigned char *pbssrate, int *= len); -void UpdateBrateTbl(u8 *mBratesOS); -void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen); =20 void Save_DM_Func_Flag(struct adapter *padapter); void Restore_DM_Func_Flag(struct adapter *padapter); --=20 2.37.2 From nobody Mon Apr 6 09:41:26 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5ECDC54EE9 for ; Thu, 8 Sep 2022 13:10:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232102AbiIHNKO (ORCPT ); Thu, 8 Sep 2022 09:10:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231996AbiIHNJq (ORCPT ); Thu, 8 Sep 2022 09:09:46 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2535C11 for ; Thu, 8 Sep 2022 06:09:29 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id go34so2893496ejc.2 for ; Thu, 08 Sep 2022 06:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=tReQnZIM/2GXsnwHvYX7dmOzuxjlvlNGIgAsvxQ1yRc=; b=i64quYvlQ46IAbHchD9nAqJI/KHzq9w0j8q6dfs7eCEhjUk3Oif4adCO7pMd5bdSIM IOu2dEyIA3Sku7i0R8zrnGgvVpEP1w7TlRcZ7Pi15Bb/Tms7sOGXhzKYmFyAeCpp5bQI ccqqOeqb+PKRf26AJprMiVpbz1LB2lCUUI3YTcYSN5LL3I3A1mQdjFCr2F70zNFDftaM dUZ4D/AUA4JUM2BN3CEemAxPdSkdUIwhb1AUzZY10VwrG5yPY66BD+e5dQ5/iaAQBKus rbp5a9YmEkBQ594K4t/9XM0E7dyaIxgwjyymYaVdcKCDk+Ur67cG+QlPJHYsgtlNF5C3 bS8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=tReQnZIM/2GXsnwHvYX7dmOzuxjlvlNGIgAsvxQ1yRc=; b=uunKcMKKm8MhUT2a5vBNsIsA/NvBHUEus8MUzSWaNcZ/O6sJxPY2fyDYy+w9ybHT8L iZALi/t75JxUFx2k8F6gefD66J1Zurga4zFYfLhcO5H/lcCd8XH7iwT2kyNx4zCXJmFA KES5GzivWY1ug4VSC3mUO0DOFfRhqRGpkoL7bG8wXdqGuyy4VaMXhu4NVul+gnKxYMU9 g179dbc1YvM7p0Hw2s0FPLkmmnVd3xOXvS0i3W5a5Yg9/RN6R3YffLtG4x53aGz/eyoN Lenw+iWYG3AtRLhqBtoAG5wUopUFzzj+lsQtR4is3ckcr1xZ2bR++Sia0bz8o0tIkvHC mA/w== X-Gm-Message-State: ACgBeo1g1o8drroAM207/6Lm/UEVW3feh94asLDpKbfdxCAT+ujQlln9 iV74j0XHNKGp9q31mzZQyCk= X-Google-Smtp-Source: AA6agR6VijqSfYBtjgJ/lXIIch+djV1FGMJrTaOymkJRGHnbP/TSIHqgHGRXbkuLmcToUBeMcizB/g== X-Received: by 2002:a17:907:2ced:b0:773:6f77:f10f with SMTP id hz13-20020a1709072ced00b007736f77f10fmr2860143ejc.34.1662642568533; Thu, 08 Sep 2022 06:09:28 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id cf6-20020a0564020b8600b0044edf0a2deasm4847978edb.69.2022.09.08.06.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 06:09:28 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/4] staging: r8188eu: remove unnecessary return labels. Date: Thu, 8 Sep 2022 15:09:15 +0200 Message-Id: <20220908130915.8406-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220908130915.8406-1-straube.linux@gmail.com> References: <20220908130915.8406-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the RETURN labels in rtw_alloc_etherdev_with_old_priv() and rtw_alloc_etherdev() and return directly to clean up the code and improve readability. Signed-off-by: Michael Straube Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/os_dep/osdep_service.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/stagi= ng/r8188eu/os_dep/osdep_service.c index 3504a0a9ba87..875a41650896 100644 --- a/drivers/staging/r8188eu/os_dep/osdep_service.c +++ b/drivers/staging/r8188eu/os_dep/osdep_service.c @@ -54,14 +54,13 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int= sizeof_priv, =20 pnetdev =3D alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4= ); if (!pnetdev) - goto RETURN; + return NULL; =20 pnetdev->dev.type =3D &wlan_type; pnpi =3D netdev_priv(pnetdev); pnpi->priv =3D old_priv; pnpi->sizeof_priv =3D sizeof_priv; =20 -RETURN: return pnetdev; } =20 @@ -72,19 +71,18 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv) =20 pnetdev =3D alloc_etherdev_mq(sizeof(struct rtw_netdev_priv_indicator), 4= ); if (!pnetdev) - goto RETURN; + return NULL; =20 pnpi =3D netdev_priv(pnetdev); =20 pnpi->priv =3D vzalloc(sizeof_priv); if (!pnpi->priv) { free_netdev(pnetdev); - pnetdev =3D NULL; - goto RETURN; + return NULL; } =20 pnpi->sizeof_priv =3D sizeof_priv; -RETURN: + return pnetdev; } =20 --=20 2.37.2