From nobody Sat Jun 13 13:43:48 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 06701C433F5 for ; Wed, 13 Apr 2022 05:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232417AbiDMFb5 (ORCPT ); Wed, 13 Apr 2022 01:31:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232216AbiDMFby (ORCPT ); Wed, 13 Apr 2022 01:31:54 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDB07F46 for ; Tue, 12 Apr 2022 22:29:28 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id be5so996707plb.13 for ; Tue, 12 Apr 2022 22:29:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs-iitr-ac-in.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=SU06F0E/6Ll18cOJ9kDEcDAQxtLOOYiD7ubHubdxNe0=; b=3vY0gSvqWMFvxn6KV3wc7Bzm2I95jgL/u+CPyit8Ipnp+Ho2OSB0qKPkOSpzQ/Usm+ paTwM3ejrn7gx4wl/tf7yBTFm/SWy9Z2liddnk/+CEEYHbwaOUS69rYx7DyBEAArIRTl IGV1Syn8DTU/9fgdYcsV4jdg4/vYGmLa/N0+Hkt+CAc9yzBZdR3PedSRKcHeIAsPmIN/ 3CEVkJU33SnNpuvSXsH/pNdfXiCYiO3VhD1b6FQaHsyjaKi2AnJkDY7TADV3vVctMcI2 KueQkbhkYCwRclPVj5j1k3F4zzhgf+0cM+gJsb4VejpZsYYmPZ4+iYc/RJxYXiOB6OAI g67g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SU06F0E/6Ll18cOJ9kDEcDAQxtLOOYiD7ubHubdxNe0=; b=Idw168fFSCFw1sq+7FJAXulMcN3BBrPeZExapLoM2wjh03IpYDFwPpBMeU9AGW7uf5 EjJZsCEoPy+7oqWaNqNq82TdXD9Zo2jJ2T0r11NXxk7/g00S2I1d0oblDV6S3drj470o VSfSqFHOtvSV1dKzK11T3Zf1+AqIMFIm19f9ZTgX2PZ1NknvEYCu0LqOmc49NtCj7/cD 4JB2aWIsqunb0+1IfRzu4M5i9R4Axbi+fzaKpd2vB8J33DGk17dK7kBhb2BYNaj2abFY G4rKrMPOJwjEukz8Oa8QQJ9lUYcL9Pi+fKCu8lSLbG6G2FF5uiYCrZlRWgSNQDZoir1b cs4g== X-Gm-Message-State: AOAM533lD9RC8eFX00u5D6ueD8uK+C8saFYGD5+FpAnoOYMUOzm9v05g GAdHhZ/jI7aAWOT4ch/Na1L99Q== X-Google-Smtp-Source: ABdhPJyQxQdLowSvjbpYkkU+m4HF90WkJwTriwpzv1EWIMGWILpZ3y5IUSCf5vDKTD7+FXca7wizwg== X-Received: by 2002:a17:902:8490:b0:156:9846:240 with SMTP id c16-20020a170902849000b0015698460240mr40326932plo.141.1649827768340; Tue, 12 Apr 2022 22:29:28 -0700 (PDT) Received: from mahak-Inspiron-7570.iitr.ac.in ([103.37.201.168]) by smtp.googlemail.com with ESMTPSA id br10-20020a17090b0f0a00b001cd4fb89d38sm888748pjb.9.2022.04.12.22.29.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 22:29:27 -0700 (PDT) From: Mahak Gupta To: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, outreachy@lists.linux.dev Cc: Mahak Gupta Subject: [PATCH] staging: r8188eu: remove else after return and break statements Date: Wed, 13 Apr 2022 10:57:58 +0530 Message-Id: <20220413052759.4859-1-mahak_g@cs.iitr.ac.in> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Else is not necessary after return and break statements, hence remove it. Reported by checkpatch: WARNING: else is not generally useful after a break or return Signed-off-by: Mahak Gupta --- drivers/staging/r8188eu/core/rtw_ieee80211.c | 41 ++++++++------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_ieee80211.c b/drivers/staging= /r8188eu/core/rtw_ieee80211.c index 5a0e42ed4a47..bb4c9bc864da 100644 --- a/drivers/staging/r8188eu/core/rtw_ieee80211.c +++ b/drivers/staging/r8188eu/core/rtw_ieee80211.c @@ -97,16 +97,15 @@ bool rtw_is_cckratesonly_included(u8 *rate) =20 int rtw_check_network_type(unsigned char *rate, int ratelen, int channel) { - if (channel > 14) { + if (channel > 14) return WIRELESS_INVALID; - } else { /* could be pure B, pure G, or B/G */ - if (rtw_is_cckratesonly_included(rate)) - return WIRELESS_11B; - else if (rtw_is_cckrates_included(rate)) - return WIRELESS_11BG; - else - return WIRELESS_11G; - } + /* could be pure B, pure G, or B/G */ + if (rtw_is_cckratesonly_included(rate)) + return WIRELESS_11B; + else if (rtw_is_cckrates_included(rate)) + return WIRELESS_11BG; + else + return WIRELESS_11G; } =20 u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char = *source, @@ -160,11 +159,10 @@ u8 *rtw_get_ie(u8 *pbuf, int index, int *len, int lim= it) if (*p =3D=3D index) { *len =3D *(p + 1); return p; - } else { - tmp =3D *(p + 1); - p +=3D (tmp + 2); - i +=3D (tmp + 2); } + tmp =3D *(p + 1); + p +=3D (tmp + 2); + i +=3D (tmp + 2); if (i >=3D limit) break; } @@ -295,10 +293,9 @@ unsigned char *rtw_get_wpa_ie(unsigned char *pie, int = *wpa_ie_len, int limit) goto check_next_ie; *wpa_ie_len =3D *(pbuf + 1); return pbuf; - } else { - *wpa_ie_len =3D 0; - return NULL; } + *wpa_ie_len =3D 0; + return NULL; =20 check_next_ie: limit_new =3D limit - (pbuf - pie) - 2 - len; @@ -558,9 +555,8 @@ u8 *rtw_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, = uint *wps_ielen) cnt +=3D in_ie[cnt + 1] + 2; =20 break; - } else { - cnt +=3D in_ie[cnt + 1] + 2; /* goto next */ } + cnt +=3D in_ie[cnt + 1] + 2; /* goto next */ } return wpsie_ptr; } @@ -604,9 +600,8 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 ta= rget_attr_id, u8 *buf_att if (len_attr) *len_attr =3D attr_len; break; - } else { - attr_ptr +=3D attr_len; /* goto next */ } + attr_ptr +=3D attr_len; /* goto next */ } return target_attr_ptr; } @@ -901,9 +896,8 @@ u8 *rtw_get_p2p_ie(u8 *in_ie, int in_len, u8 *p2p_ie, u= int *p2p_ielen) if (p2p_ielen) *p2p_ielen =3D in_ie[cnt + 1] + 2; return p2p_ie_ptr; - } else { - cnt +=3D in_ie[cnt + 1] + 2; /* goto next */ } + cnt +=3D in_ie[cnt + 1] + 2; /* goto next */ } return NULL; } @@ -948,9 +942,8 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 tar= get_attr_id, u8 *buf_attr if (len_attr) *len_attr =3D attr_len; break; - } else { - attr_ptr +=3D attr_len; /* goto next */ } + attr_ptr +=3D attr_len; /* goto next */ } return target_attr_ptr; } --=20 2.17.1