From nobody Tue Sep 9 23:01:47 2025 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 4FE8DC6FA8E for ; Sat, 25 Feb 2023 18:20:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229595AbjBYSUi (ORCPT ); Sat, 25 Feb 2023 13:20:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjBYSUf (ORCPT ); Sat, 25 Feb 2023 13:20:35 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC414EC43 for ; Sat, 25 Feb 2023 10:20:29 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id fm20-20020a05600c0c1400b003ead37e6588so4454465wmb.5 for ; Sat, 25 Feb 2023 10:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677349228; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=xnW67Brym0rTte3s6ZMNuvgQG+ROp2tdxsefdMGNTV8=; b=NZhcDZDfytB893Ktd/pgFJyS5ahFaO1+D8YiuVboSS1NRtFIFqvC7NbTVO26Poy9vh aKJsl3ZroXTJW48lFFMibRguc0s5hXa3w9361UGaKcAvq9UeijVYp4biKlP20EzyIMLn erVJYuvHniXd+e22QumfXwggItsIJYK1GN+Nl6esitBjv/F8Zl00uUFIPPopAmXQYN9g OUFysrssZYjk+GJHqVLUJ1VcspDApi0OyubNVRgkW4EeOWj1nqmY/UVp6tIm1zRrJvPf 0opy3U6HIPCBLS52fQErc4Gs8axo/XkaNj9LkdhU0jz6pJor5xu98i3eSPwUquE0DhrH cDvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677349228; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xnW67Brym0rTte3s6ZMNuvgQG+ROp2tdxsefdMGNTV8=; b=GU+CUUp//HEcUgYrk0HCf2c2yENociHmlR+RlSRKvOYXScZDmbitmzfAYXB505u6r2 idaHXibRUF2hw8tv9/wsiZ/sxVa06qTKBtUmYkVrkul01YjHqmmuvqTsqFMdzeAJhOf0 vftkUsudDYeh0wP8ESiSfMc5asQJve6+6enyu5IMM5Hoxwy9GjrFtsVQKxgMcFRZCo+y KDmSsJXTUZSHHbD/xZDwVhz9Oca1+1OeERBMWsYudbEYejzDYDhb6aLKxr2D3AJrucs8 tGdgkOktnIjPSRCvO+bXJ8du8BFfwFf8BxNVg3gAnL4dIMRXi38VmA05pXMQpoaKepqC LTdg== X-Gm-Message-State: AO0yUKXJLudpJH+8TOMe+r0GbccTBNOhrcP+IM1pI+wCCckRRCguu3zi xX1FjUbwGzkdcQ6UCDtrkSw= X-Google-Smtp-Source: AK7set//DJNiYuqmzRGc0wVCg3vVA36d1USP3IqRtTSm1hu14l4IsefYh2k1ElXOxwCD08PiWjeFtg== X-Received: by 2002:a05:600c:4f4e:b0:3d2:231a:cb30 with SMTP id m14-20020a05600c4f4e00b003d2231acb30mr18386165wmq.3.1677349228365; Sat, 25 Feb 2023 10:20:28 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id ja6-20020a05600c556600b003dfefe115b9sm3486834wmb.0.2023.02.25.10.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 10:20:27 -0800 (PST) Date: Sat, 25 Feb 2023 19:20:26 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] staging: rtl8192e: Remove checks of pointer to handle_a.. and handle_b.. Message-ID: <5c0fd114c24616bc03271ccb0a72a6bc68e45d61.1677345331.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Function pointers of handle_assoc_response and handle_beacon is set while executing the probe function. Therefore a NULL pointer check is not required. Remove checks as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 4 +--- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 669e74a67190..35b36f7c0f28 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -2689,9 +2689,7 @@ static inline void rtllib_process_probe_response( is_same_network(&ieee->current_network, network, (network->ssid_len ? 1 : 0)) && (ieee->state =3D=3D RTLLIB_LINKED)) { - if (ieee->handle_beacon !=3D NULL) - ieee->handle_beacon(ieee->dev, beacon, - &ieee->current_network); + ieee->handle_beacon(ieee->dev, beacon, &ieee->current_network); } free_network: kfree(network); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 2552aa089700..d697089e0cad 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2241,10 +2241,8 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, str= uct sk_buff *skb, memcpy(ieee->ht_info->PeerHTInfoBuf, network->bssht.bd_ht_info_buf, network->bssht.bd_ht_info_len); - if (ieee->handle_assoc_response !=3D NULL) - ieee->handle_assoc_response(ieee->dev, - (struct rtllib_assoc_response_frame *)header, - network); + ieee->handle_assoc_response(ieee->dev, + (struct rtllib_assoc_response_frame *)header, network); } kfree(network); =20 --=20 2.39.2 From nobody Tue Sep 9 23:01:47 2025 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 4A258C6FA8E for ; Sat, 25 Feb 2023 18:20:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbjBYSUo (ORCPT ); Sat, 25 Feb 2023 13:20:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229609AbjBYSUm (ORCPT ); Sat, 25 Feb 2023 13:20:42 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B568EC6F for ; Sat, 25 Feb 2023 10:20:37 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id bt28so2306102wrb.8 for ; Sat, 25 Feb 2023 10:20:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677349235; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=oAsMPynv8Bt+koPnerCzdUfaVHcGsUSJc1fCVIYNQFA=; b=J8J2hwqCf/p3DAyZsJuEvqex0XndijwDLiQWDEA5Ryr37gLIe6VsPUoAUQNaYbX6mi o8c07IzX1PwxQ/zoxvTHVFwEAS4nOGcC98Y/tvvyd37SMZv110xdBWxx0g8AzGfX8hmi vJxXZ9QTCLOfGBAJ2klBXnIHXNIzsCPGTus8F95po/OtPGzRqLhkqBGla6hXHX5SbBZq /Ca6e9LNED8G19DYP9FVWzOOrIMO9NNgtl4Vy3EFOdVX9NU+I8VyiJXJ2z2iCFrw+Cvt MCIA9K5D7iddN6SOKZcYTteELPqTT+nwFtEtCAmiKC7IBw9lsJT0N2eB4yJ5BqA+xigA 7h0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677349235; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oAsMPynv8Bt+koPnerCzdUfaVHcGsUSJc1fCVIYNQFA=; b=13c3p5CVCZ9QzLvVgH1YNE7wEj8D+lVieh+pATC2dAbTHRSDJOWC5OrNvPtmxE2daf scQIrK1i93PAZ9KVEDcABl0j1PcsXdonFxJR/KZWNA7lQxiXdTjc93YSygFfcdSBsodO NcBCo1tBO22X90S0iApF1x2Bg88Drqauch9rmkMFfj5Mu9dNq6579tbtFFcUv+HBbZHy LoihlRjRUFmzhWgOciQiCbu1HNvOKI7s2jzcnFhMZZBcemB8W7Zq/50PriH01RHZCK9W xRfzTCK3o9wB80xdk17AFZEXJLCtwuB7h4wpCpqibGORnCjI9fqhoTiQDvy5AOHeqgR3 +ssw== X-Gm-Message-State: AO0yUKVnXJeG6wGgsMRVJvsryiRliAYGXR4ngZj4o9DfJCZAb5aQAMcu 76Nd5dreyU3uOHN3h6GX1YQdiP7W5A4= X-Google-Smtp-Source: AK7set9H3Xy+t9aY/FGfoyHgAVUnS5XYXcZuaqpV9CPJ5twJrbJ6+xs1/3h/gvTKgK/qeMt3S35eXg== X-Received: by 2002:a5d:4e11:0:b0:2c9:993a:f4cd with SMTP id p17-20020a5d4e11000000b002c9993af4cdmr1227626wrt.1.1677349235589; Sat, 25 Feb 2023 10:20:35 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id p10-20020a5d458a000000b002c559def236sm2375831wrq.57.2023.02.25.10.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 10:20:35 -0800 (PST) Date: Sat, 25 Feb 2023 19:20:33 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] staging: rtl8192e: Remove checks of pointer to LeisureP.. and start_se.. Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Function pointers of LeisurePSLeave and start_send_beacons is set while executing the probe function. Therefore a NULL pointer check is not required. Remove checks as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 3 +-- drivers/staging/rtl8192e/rtllib_softmac.c | 3 +-- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 35b36f7c0f28..c394c21beefb 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1214,8 +1214,7 @@ static void rtllib_rx_check_leave_lps(struct rtllib_d= evice *ieee, u8 unicast, if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + ieee->link_detect_info.NumTxOkInPeriod) > 8) || (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) { - if (ieee->LeisurePSLeave) - ieee->LeisurePSLeave(ieee->dev); + ieee->LeisurePSLeave(ieee->dev); } } } diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index d697089e0cad..b06baf5ff6d4 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -669,8 +669,7 @@ EXPORT_SYMBOL(rtllib_stop_send_beacons); =20 void rtllib_start_send_beacons(struct rtllib_device *ieee) { - if (ieee->start_send_beacons) - ieee->start_send_beacons(ieee->dev); + ieee->start_send_beacons(ieee->dev); if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS) rtllib_beacons_start(ieee); } diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 06f3d75dc102..f90764d1d9ab 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -340,8 +340,7 @@ void rtllib_wx_sync_scan_wq(void *data) =20 chan =3D ieee->current_network.channel; =20 - if (ieee->LeisurePSLeave) - ieee->LeisurePSLeave(ieee->dev); + ieee->LeisurePSLeave(ieee->dev); /* notify AP to be in PS mode */ rtllib_sta_ps_send_null_frame(ieee, 1); rtllib_sta_ps_send_null_frame(ieee, 1); --=20 2.39.2 From nobody Tue Sep 9 23:01:47 2025 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 C966AC64EC7 for ; Sat, 25 Feb 2023 18:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229613AbjBYSU4 (ORCPT ); Sat, 25 Feb 2023 13:20:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229610AbjBYSUy (ORCPT ); Sat, 25 Feb 2023 13:20:54 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26F701026E for ; Sat, 25 Feb 2023 10:20:47 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id h14so2316976wru.4 for ; Sat, 25 Feb 2023 10:20:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677349245; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=YAkY5lWd2mIuBvpl4SjoFin1YMe8Z/rLiJhwo7Z2OPc=; b=B1eiWnexElXDHgwxS0+ddCOgB6pVW1iCzuLqe9IQsIaawvDHDf8sQCGPGOdeDgkRzk GHWiYS2TQRx5xKZYU/3gTF2EfdvT/yHtxUsOdpr/h7ITgmWiwZn0Rd9ucpHZREuSFl/C DpYD8hkPzGGD4FljPbw8/iIpvWt7bRikJjEyPp0h8g0iw+BBDQHFYlfcGR3Q78+YkOJh 2Uye0zwyDE2XZUuz9G4ApxzV6uz5Q5Y6ktdb/mNzEM0upTiT2JRJYqqJ/veKMJl79sAS nnOSN1ADN4jONNGrdc8UGbXVZROK4pfTj4977Co/PoAxWHvQ+byLxawvNMFJrR4XfxXu RrSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677349245; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YAkY5lWd2mIuBvpl4SjoFin1YMe8Z/rLiJhwo7Z2OPc=; b=HKntwYK93HK4f5KA4XXJPPcld2YaONz2M3q2vLYSVmvDu7oFJEcsFdX/NoQtYkghCi +VgNj1600MDVODtcnWzrLs7DRJXYbpzsVe0MDsjFWy5SOJAZnB4W1Z15zbUVXf/87mnq hDq9rD/3aRK4uLL8wf9uN8g4LFAxzzr5t+dHb8EPpEApIOYjNAe37aM8/RYe6fw7Q6qF 1A/oog6Il3wQIkQ0x6OdglK077Phot5ymo5UavCGJLKe4wuqyt25cKK39mt7v24k6a61 zBJG47jHWLZMQcg0r6EQEdqS4xUsKSQ8Ozt9eMIEkf7eCYJAwWeS7V9aCzN19odkuiC5 mAcA== X-Gm-Message-State: AO0yUKU+7sXYJpCD6EeMe6nmji76yWr8Gh3oTyCrpTb6kx/JHXkUZfk+ fY1KLlMeD2c8OEyPvEMf8nc= X-Google-Smtp-Source: AK7set/7mZeQBjNSPHLMZWfPKrfwHMZh8Wlq1RFqWrNIjqW9Y5gq/FQTC9gR7uzFPbfo7xTYdmUtRA== X-Received: by 2002:a5d:6a8e:0:b0:2c7:1c72:69ac with SMTP id s14-20020a5d6a8e000000b002c71c7269acmr3880175wru.2.1677349245596; Sat, 25 Feb 2023 10:20:45 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id f12-20020adffccc000000b002c705058773sm2352715wrs.74.2023.02.25.10.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 10:20:45 -0800 (PST) Date: Sat, 25 Feb 2023 19:20:41 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] staging: rtl8192e: Remove checks of pointer to stop_send.. and rtllib_.. Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Function pointers of stop_send_beacons and rtllib_ips_leave_wq is set while executing the probe function. Therefore a NULL pointer check is not required. Remove checks as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index b06baf5ff6d4..7b73c5df5e2a 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -659,8 +659,7 @@ static void rtllib_beacons_stop(struct rtllib_device *i= eee) =20 void rtllib_stop_send_beacons(struct rtllib_device *ieee) { - if (ieee->stop_send_beacons) - ieee->stop_send_beacons(ieee->dev); + ieee->stop_send_beacons(ieee->dev); if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS) rtllib_beacons_stop(ieee); } @@ -728,8 +727,7 @@ EXPORT_SYMBOL(rtllib_act_scanning); /* called with ieee->lock held */ static void rtllib_start_scan(struct rtllib_device *ieee) { - if (ieee->rtllib_ips_leave_wq !=3D NULL) - ieee->rtllib_ips_leave_wq(ieee->dev); + ieee->rtllib_ips_leave_wq(ieee->dev); =20 if (IS_DOT11D_ENABLE(ieee)) { if (IS_COUNTRY_IE_VALID(ieee)) @@ -1584,8 +1582,7 @@ static void rtllib_associate_procedure_wq(void *data) rtllib_stop_scan(ieee); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); if (ieee->rf_power_state =3D=3D rf_off) { - if (ieee->rtllib_ips_leave_wq !=3D NULL) - ieee->rtllib_ips_leave_wq(ieee->dev); + ieee->rtllib_ips_leave_wq(ieee->dev); mutex_unlock(&ieee->wx_mutex); return; } --=20 2.39.2 From nobody Tue Sep 9 23:01:47 2025 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 252F2C6FA8E for ; Sat, 25 Feb 2023 18:21:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229627AbjBYSVO (ORCPT ); Sat, 25 Feb 2023 13:21:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229614AbjBYSVM (ORCPT ); Sat, 25 Feb 2023 13:21:12 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DD01EF9B for ; Sat, 25 Feb 2023 10:20:54 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id q16so2333295wrw.2 for ; Sat, 25 Feb 2023 10:20:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677349253; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=pQfE6owmx25R9kpYaCFxHRafZIy5ewbzgQeY1A/MnUs=; b=NHG1Jgf18DnO1h8grz2aXe2DhmHOhucgvLlvFwzZDWtjWqruRlE5EB0CR2c8lHzmlL Y3/L8uer/t3Mrj2USY4BZG8LXC4G0ANpRuEJQjd1ejJZuBccAiAoZ1IgK9K9WHp9kZNA A0e+Z4vWuyq03m457GjSqGjxVUFEh6O31AQwnPcJj6sViKXUzXjOqfTj7Sqo/oq5nRAK +sY0cw7JMeWXaDXBffJGMkVmEKpF9otsR1dHBtiTIyk69JD2TMeiYUi+sc8H6XSmphEH Mpz850LHpgwnLU27UEowF7UoCZM63bSMlknlWurSDxrsQnSyB0/sZSPuHzERD3aNyAmq 6Z4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677349253; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=pQfE6owmx25R9kpYaCFxHRafZIy5ewbzgQeY1A/MnUs=; b=Dq1aVtYqdY/vcIZVk9ctMr5r/yFGyEO3+UQ0oNutQkdBkpcHe6QS8+BWwYhC1czsy7 OAHTdb+bHFIoO49j0WJiaX5/F07JEqSUwQNflDefv8icLxdxJD1RomM54dhmdAKwg16T 7VLzol9oLEu2NKxYnon/Dv2s32JfZFBJv/3gu5DxN0V92z/uTgSIa0QxG5wUnIkZ6a1M x4pv8cuQUtc13pV0wFGZ+efYD9ySCdF8Lb50Kbhp4YTTFqvBUbvRvI3oNEkpJWrOeU3Q PBpG1VA4Aq8ukG2ecAvlvftAoZlF/itRvXuMzLl92gDTeZJILRpqNQUEC+djrqo/FExp q1+A== X-Gm-Message-State: AO0yUKUIfoRa3OUNcGA8pOmZJBZrJmAR2K4Nub80qyCmv18iFwMoQFKr 5q1nuCBW8W2I85Tm5BMRvc4= X-Google-Smtp-Source: AK7set/L/NtX8fyS60aJUMEv9ZTL6L153IChak5NBsXvwU+LDhkSU4/wRze1ZfIEAqOm4PU3ooBYTA== X-Received: by 2002:adf:fb0f:0:b0:2c7:b5ef:9695 with SMTP id c15-20020adffb0f000000b002c7b5ef9695mr3493681wrr.3.1677349252894; Sat, 25 Feb 2023 10:20:52 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id y14-20020adfee0e000000b002c71b4d476asm2370349wrn.106.2023.02.25.10.20.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 10:20:52 -0800 (PST) Date: Sat, 25 Feb 2023 19:20:50 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] staging: rtl8192e: Remove checks of pointer to rtllib.. and ScanOpera.. Message-ID: <8b01cbfaad2db4666b98bfeae29dd429d8c6cd07.1677345331.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Function pointers of rtllib_ips_leave and ScanOperationBackupHandler is set while executing the probe function. Therefore a NULL pointer check is not required. Remove checks as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 ++------ drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++---- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 ++---- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 718d69b4ce16..47feb4248d25 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -703,8 +703,7 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) if (priv->up =3D=3D 0) return -1; =20 - if (priv->rtllib->rtllib_ips_leave) - priv->rtllib->rtllib_ips_leave(dev); + priv->rtllib->rtllib_ips_leave(dev); =20 if (priv->rtllib->state =3D=3D RTLLIB_LINKED) rtl92e_leisure_ps_leave(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index bf0030144e5d..cb28288a618b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -432,15 +432,11 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, if (priv->rtllib->rf_power_state !=3D rf_off) { priv->rtllib->actscanning =3D true; =20 - if (ieee->ScanOperationBackupHandler) - ieee->ScanOperationBackupHandler(ieee->dev, - SCAN_OPT_BACKUP); + ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP); =20 rtllib_start_scan_syncro(priv->rtllib, 0); =20 - if (ieee->ScanOperationBackupHandler) - ieee->ScanOperationBackupHandler(ieee->dev, - SCAN_OPT_RESTORE); + ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE); } ret =3D 0; } else { diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 7b73c5df5e2a..4923423aa85b 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1572,8 +1572,7 @@ static void rtllib_associate_procedure_wq(void *data) struct rtllib_device, associate_procedure_wq); rtllib_stop_scan_syncro(ieee); - if (ieee->rtllib_ips_leave !=3D NULL) - ieee->rtllib_ips_leave(ieee->dev); + ieee->rtllib_ips_leave(ieee->dev); mutex_lock(&ieee->wx_mutex); =20 if (ieee->data_hard_stop) @@ -2850,8 +2849,7 @@ void rtllib_stop_protocol(struct rtllib_device *ieee,= u8 shutdown) if (shutdown) { ieee->proto_started =3D 0; ieee->proto_stoppping =3D 1; - if (ieee->rtllib_ips_leave !=3D NULL) - ieee->rtllib_ips_leave(ieee->dev); + ieee->rtllib_ips_leave(ieee->dev); } =20 rtllib_stop_send_beacons(ieee); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index f90764d1d9ab..06f1d6de5cc7 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -355,8 +355,7 @@ void rtllib_wx_sync_scan_wq(void *data) /* wait for ps packet to be kicked out successfully */ msleep(50); =20 - if (ieee->ScanOperationBackupHandler) - ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP); + ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP); =20 if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht && ieee->ht_info->bCurBW40MHz) { @@ -381,8 +380,7 @@ void rtllib_wx_sync_scan_wq(void *data) ieee->set_chan(ieee->dev, chan); } =20 - if (ieee->ScanOperationBackupHandler) - ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE); + ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE); =20 ieee->state =3D RTLLIB_LINKED; ieee->link_change(ieee->dev); --=20 2.39.2