From patchwork Mon Oct 2 17:53:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147515 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1718946vqb; Mon, 2 Oct 2023 15:10:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGdkN+QIO5bPwFVM4oKHGPg+/9XH6kQfJP0Kvrgy4UQvGyzNVotl8XMY2XPdzm7kmpzHUi8 X-Received: by 2002:a05:6358:9494:b0:140:e7af:44c9 with SMTP id i20-20020a056358949400b00140e7af44c9mr12275977rwb.23.1696284632902; Mon, 02 Oct 2023 15:10:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284632; cv=none; d=google.com; s=arc-20160816; b=qQmGUC8skjqy+k0mpSL1dw6GPvYY3IaEo4NwcgC9Yn06rxhGHrNouNpbTcv0PjStdo nd8uPlFukIdqS8r94Shc8kf/qJSz0zBOBdYT8hGMRqNKrxUeamUM9RVURYNwFnUJFwpO 5IE3es3yA1WDYJOx4jedclx4rScrGzFnEdIwLfGU3sMlWnqn6Sm9GD3Z3ZNB93KotRPI F+v1tm4sohDEe63dJuGsynib1EtgnTFmQClFqjOFqCAJZ54dQ39DoroRvgyKW44/B2V2 vR0H7EEUlfTrgrzipwOPVNgt0HMONq2VdOdWJ6ro6fOZ+AopEZIuxDsOke9m43wY/hXg pFwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=BFQQ8VYOAr6qNDG5scul8J1mas0KU5lvrUkFm3jfx9c=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=ycI9cTxAPc3YJ74lGYwZrH//iZpT0PQXUm8SAxUIEcBEWlYFPja7E6kPeB8ODLi4hx x9wHFZJlTqJh+5fWQVxLarxRkFgNM/p7ETaT0WnofoM29b1Ng0S6610X/C8u4JWUtuGS yUcA1Kd8RHLLcgXYBer+Sm+YTXNkJl3ODWRIoofjWfLb+b8nVKpPP12OChxXEWG6jQtQ uyrAdX8mod0GKabgbcN9SM530a128B8vHUEI14h1N4eaAZ/dY5jssM7Gw1KDQAMPfja4 Aq4dBpuSQWj+EvPZupFaMzngv2gDvzKfMVFWgtiFU+u8MtMjUWbxdMwmgULftFbgEM2I rsEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=S7H5BP36; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id ca21-20020a056a00419500b0068e29a05fa4si27283346pfb.326.2023.10.02.15.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:10:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=S7H5BP36; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D7AAD8047D6A; Mon, 2 Oct 2023 10:53:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238317AbjJBRxR (ORCPT + 18 others); Mon, 2 Oct 2023 13:53:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237984AbjJBRxP (ORCPT ); Mon, 2 Oct 2023 13:53:15 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 425D083 for ; Mon, 2 Oct 2023 10:53:12 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9b2c5664cb4so190904066b.1 for ; Mon, 02 Oct 2023 10:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269190; x=1696873990; darn=vger.kernel.org; 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=BFQQ8VYOAr6qNDG5scul8J1mas0KU5lvrUkFm3jfx9c=; b=S7H5BP36OyXRBQ5Rxxyf/KVS0HROdy7TXxhm+dbOjAPTrKq2SlljcJcsPyEaV2UmH9 ymEJ6XTn8Dgy8iHpkvQFA8hXrEAopZuyuhoo4ZnyT2yxdBeC3VyEd8zZBRao0i1fXUWm yb0eSOYhcOPpf9xkyqkVfNR/c62xtnfX5c82PbF806rwxf+Lea0YY/d0I50kz1y1R9w6 9wr6eaLfimwcOYNzW8tXccUI3Ovg71Ybhp5MdITgMntX0ias7c9WB7XklbzLkHzD0av2 xz7FOMsxBP9ca9kNt8sPlFdQeHfqTFt21F9bJT0miPWp7sIYsV7XW4Gdv4RelqK38T5u FO4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269190; x=1696873990; 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=BFQQ8VYOAr6qNDG5scul8J1mas0KU5lvrUkFm3jfx9c=; b=bhtW66D4JdyEcG87kIH04AeGRy69MWlZOh1kTQuG/HnBP8oNGgg2E/seMFZ72ufbbW QpF0H5EHXbIKN5Cf9CSo7dPUe8SH6IVjUiTAI0XryJBcKFXadCcoAkup203nyKCYvgYE 7xZHFCiNcflkEZFPRYvABBLLRTK/nh34V7T7T8gcnNA89JjRTb39obhtw7pnKiHKRZJi GMMA6DhRhAQZpHbCQdfXYvvLbQnX+LfBUCTzXB1Ucf21zyRFzO+ZUxT/X2+otiMfpAR6 tHeYd13Ko5/0JUwfNiOf7oTfG4H4Cllz8D/b6FpbRMteGbObLLk3ru5EoCeWH56yFw59 fusw== X-Gm-Message-State: AOJu0Yx6gc/7nWleyD1+CTBlWKxpsqWwMQuVfIX3U8wHpd/L3jKyMiCh WiA4uFek9ujNiiJtuE6AoXNaQ2iuAaA= X-Received: by 2002:a17:906:25d:b0:9b2:bf2d:6b65 with SMTP id 29-20020a170906025d00b009b2bf2d6b65mr11389311ejl.4.1696269190437; Mon, 02 Oct 2023 10:53:10 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id k5-20020a1709062a4500b009934b1eb577sm17589605eje.77.2023.10.02.10.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:10 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:08 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/8] staging: rtl8192e: Remove unused function rtl92e_dm_backup_state() Message-ID: <104b248b35b4fda560056fc4ab4ac230dea98d3f.1696266964.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 02 Oct 2023 10:53:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778683355303467331 X-GMAIL-MSGID: 1778683355303467331 rtl92e_dm_backup_state() is unused. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 19 ------------------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 1 - 2 files changed, 20 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index c29bc85f9577..5217ace3f140 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -973,25 +973,6 @@ static void _rtl92e_dm_bb_initialgain_restore(struct net_device *dev) rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x1); } -void rtl92e_dm_backup_state(struct net_device *dev) -{ - struct r8192_priv *priv = rtllib_priv(dev); - u32 bit_mask = bMaskByte0; - - priv->bswitch_fsync = false; - - if (dm_digtable.dig_algorithm == DIG_ALGO_BY_RSSI) - return; - - rtl92e_set_bb_reg(dev, UFWP, bMaskByte1, 0x8); - priv->initgain_backup.xaagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XAAGCCore1, bit_mask); - priv->initgain_backup.xbagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XBAGCCore1, bit_mask); - priv->initgain_backup.xcagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XCAGCCore1, bit_mask); - priv->initgain_backup.xdagccore1 = rtl92e_get_bb_reg(dev, rOFDM0_XDAGCCore1, bit_mask); - bit_mask = bMaskByte2; - priv->initgain_backup.cca = (u8)rtl92e_get_bb_reg(dev, rCCK0_CCA, bit_mask); -} - static void _rtl92e_dm_dig_init(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h index 01587e2fec65..9085a6454cbc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -179,7 +179,6 @@ void rtl92e_dm_txpower_tracking_wq(void *data); void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14); void rtl92e_dm_restore_state(struct net_device *dev); -void rtl92e_dm_backup_state(struct net_device *dev); void rtl92e_dm_init_edca_turbo(struct net_device *dev); void rtl92e_dm_rf_pathcheck_wq(void *data); void rtl92e_dm_init_txpower_tracking(struct net_device *dev); From patchwork Mon Oct 2 17:53:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147502 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1713983vqb; Mon, 2 Oct 2023 15:01:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/pjmL1BDGozFjI31P0Fk7R4LCmRgFjeya64QHmAX2WsbmL/ZCax9SlJocQmiQLzYzgn4T X-Received: by 2002:a05:6e02:1bef:b0:34c:bc10:2573 with SMTP id y15-20020a056e021bef00b0034cbc102573mr16245796ilv.3.1696284077611; Mon, 02 Oct 2023 15:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284077; cv=none; d=google.com; s=arc-20160816; b=rezo0CmEpUvBvaV1HUYlLcaaTNmPhVgreg5FpGWvVd1Qs11D1WqCDWWuudTP2XZM0H yll7WHHZeVqxSQZH2aaEguMqXGbiG/IzmhgORhjGvAOkD05CYYePZztyVwxxS9ESkJFQ sxXcUsBFB889AoozF4aLEHkOqZdWkjCXyK9OxcNJMj+pFJ5HeR2vSY0ycuKzOJzFgCzI JMQtPWOfCe7OqNcm9gLZyxqeuNV03obVPO8vSPYF+GOhoJAQImf0Tkb0R8NLbOGABDfb 37a72Cy/+Kh56MMkSt/W41YnIHrnTtJjceqp1IrjLkcgr8REafCujkMxcXMCWIYqXPsd ytyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=Ayat5KM/WUkPq1z1BDmKsHr3rXeO84/wlnct3+KjBfI=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=Z11YkuXwVn4wlyG0/mzZ4x3xFZfkTQjWzaQFNXfTGYi308UlJ0QCMQNXPT2w/O1Zfc iCe5M4Q7kIUNDgjGB63lAmysgiEv+QXZJX9kOo2iSzzIDZvmqXJJfjXjsET+/l0cM6Yc bIMwBWCvF4GNmy2irpiCatsmBwCh069pdQ1gJ0QEJL/m96FdMqWKJ3DtSoERh70o4xfw 5a3T1Jm4udtwnEd7lW8iAlSJzbVMMdvDw0mAuECnxcOdbjrnmR/+AQFdCjkii3h+Uqfz 0L8nAfqbGurXOclvzk8OmNO8szUuaKWOctFbxraq3EkmyokELtNkcWYVjW5jhBOWCQo4 PRYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iJalnKRj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id k186-20020a6384c3000000b005859c255ce8si9338149pgd.819.2023.10.02.15.01.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:01:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iJalnKRj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 72166827AFAA; Mon, 2 Oct 2023 10:53:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238633AbjJBRxg (ORCPT + 18 others); Mon, 2 Oct 2023 13:53:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238650AbjJBRxd (ORCPT ); Mon, 2 Oct 2023 13:53:33 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E89C1F2 for ; Mon, 2 Oct 2023 10:53:29 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-53636bc91a8so1134454a12.1 for ; Mon, 02 Oct 2023 10:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269208; x=1696874008; darn=vger.kernel.org; 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=Ayat5KM/WUkPq1z1BDmKsHr3rXeO84/wlnct3+KjBfI=; b=iJalnKRjlujpgDH4Q7pZ6TW6hxyhu7cVlVEu7Rb6XgbMbmzT+ZJP+9Wja/2/AWq//L GweeCfNXeYZF4stNsF9lx3uWTW7SPUyzS2gRf3CC64l7P2X5A30FgW1TXvVHDFtQcLeq 8Fi5GHHiB3+h1ARPr8m1L70kbLXTKMgzUtChYNwjbO2jNYeyBdFzAWOAg/M3Ndni7804 sQ2GSW4jdhE3UuqvDy+5Jk/5LEvohR78SQw8cifYW8Eylwn4k7sVOhccDTKeBpPST6Dh NLZf9Yd2NGL8VPPcAzB2x0RXTSOmsP4vd9GCFYewgVQfSbayyXtvUJilRFtdMIMYnJRp L5Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269208; x=1696874008; 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=Ayat5KM/WUkPq1z1BDmKsHr3rXeO84/wlnct3+KjBfI=; b=WxSUDH9FFy/onfjFFMn8RhIQYXEwDzAsurgWdk7OkMMxwY+XB4fG+lct1YtdbIKlyo xwZPtH6sblfD97/IaorD/xxL8zJPXPLRA/Vv5eqBwFuFtOpEyOfmeL6fZe7CYqcwy1QZ VkLgNBFYCwMdDEsCAJHwAJg98z4mU2nYhe00O9LGAQuEsTcZ5fvFD2mOaISJhVfXA/g9 8t8jlLf1oVAW4olwkm6IQveS+F/jXyhCAlPQQAeTkbXeRptM6NrFDdyKZHUHN4vdwSS/ v9w4DQK5p8Kl+pdEkaStpUxwF2xhHi2sjGAO1fxR7gA+OEMobXBH8vt090hgq5OP8p6A GiMA== X-Gm-Message-State: AOJu0Yx6YvVcdoaVnQo6iiFzI8ZUGdRNrNieYjN+pXbMfP2kLQ4JLO/3 x1oZRagqws38IzJ1c6n612AHeeF5Lok= X-Received: by 2002:a17:906:74d4:b0:9b2:b149:b816 with SMTP id z20-20020a17090674d400b009b2b149b816mr9417257ejl.7.1696269208425; Mon, 02 Oct 2023 10:53:28 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id qk8-20020a170906d9c800b009a1dbf55665sm17183634ejb.161.2023.10.02.10.53.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:28 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:26 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] staging: rtl8192e: Remove unused variable last_ratr Message-ID: <2b91a8f4ec6184c2f16b8f65bdf65c69a4d17458.1696266964.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 02 Oct 2023 10:53:46 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778682773174085261 X-GMAIL-MSGID: 1778682773174085261 last_ratr is written but never evaluated. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 -- drivers/staging/rtl8192e/rtllib.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 8f5e4b932350..52b9393b55e7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -370,8 +370,6 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) ratr_value &= ~(RATE_ALL_OFDM_2SS); rtl92e_writel(dev, RATR0, ratr_value); rtl92e_writeb(dev, UFWP, 1); - - pra->last_ratr = target_ratr; } } else { diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 004818520ea8..1e474691aa88 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1164,7 +1164,6 @@ struct rate_adaptive { u8 ping_rssi_enable; u32 ping_rssi_ratr; u32 ping_rssi_thresh_for_ra; - u32 last_ratr; u8 PreRATRState; }; From patchwork Mon Oct 2 17:53:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147533 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1725727vqb; Mon, 2 Oct 2023 15:26:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHehCZ1vhMqN34++LKNnMl3x9qZqGmvJ0em9ndIBEoepPjQSWa0t0wQvQP9M+HsACTchkET X-Received: by 2002:a05:6808:1305:b0:3af:985b:365c with SMTP id y5-20020a056808130500b003af985b365cmr3562819oiv.42.1696285573293; Mon, 02 Oct 2023 15:26:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696285573; cv=none; d=google.com; s=arc-20160816; b=yLhd96znmUl3rixeiOxCzYDgg2sRNpZXd3TF9sXdTbV0McZqDaB9NIwHi2YSh50xOO wTR2OATZvzZPA3ZRfdO/BXp34gL61QFNdhMUapPrROe0XFzBTf8B18DDsJCFM6eH3M5L 7kyp65EbqRqH4QKQTV61Mlb5651p8sytfrVC4aYUTKiV8jihQrDUgYh5E8u8khK4butQ piD18xJq/7DdK3+HssirVJRiPEa2+LGKBzWX/3hWGw6Olxk2gyd+ZNawnWA3p4soKC2N 9yijz6iKN63uSBKHe/0iNPeJZNPzIA2jxaJrCoR49V0WsAUL9FhXXB6EQmKlhiAsSlv3 Faag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=YIcOLQi7rOEZO2zRfMF5D3C/NLGqqczvIFQ3scs6Ros=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=rto69wKFHIgzE1R1asj7kYWMwjC02b7ISUjUya4WioGdssq/Cqr2HMvtXaDuaBAZWf N8lR7wtVoOlU/BJ9uLosr9IBVCYR/2gPxbA+kietnE9Szrc76q5tfWGyzt1inmDyb+KO IJlgCpVKbDYJJwUqurybwTFnlcYFmxeq3hYu1FsR5Plq7RWalD2NYBoIeWKXQtISsQJv G/fdYed3mjzDVBeczt7MmwAaZdA5LJ9HKPDLZ8gqPi18h6y5imOXfQY4/AgaeiOz+YE2 APimIqpQFZXQNJVJ5UfN3SM4ObN98jacDK8S73Ai40xCLd5eevrRLTz300UxPHq8DKg9 5Zzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JKBrDt01; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id lb14-20020a17090b4a4e00b00278f524d83dsi9142494pjb.95.2023.10.02.15.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:26:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JKBrDt01; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id AD820812E02A; Mon, 2 Oct 2023 10:54:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238317AbjJBRx4 (ORCPT + 18 others); Mon, 2 Oct 2023 13:53:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238474AbjJBRxy (ORCPT ); Mon, 2 Oct 2023 13:53:54 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4983E5 for ; Mon, 2 Oct 2023 10:53:49 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-52f1ece3a76so4651367a12.0 for ; Mon, 02 Oct 2023 10:53:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269228; x=1696874028; darn=vger.kernel.org; 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=YIcOLQi7rOEZO2zRfMF5D3C/NLGqqczvIFQ3scs6Ros=; b=JKBrDt01TuJEWKw0o6jrq3sOEtBd5lgHp4sFHg9gIPIHA2qiIG6NB6BrQ0D9uMnwqu SITsTeJ5PD2dMWNIYmdzKDNY0YxdOzfeez1sjzPa5dv76FtH5qRbfPgO6sqSM/8hynku BVM6kx6EgiF8YNxZ2GtfE1KUNjOZYrJ2aAXxU2TLg2GVH86WXQu6ARhLmOAhBwUsRkL/ JTCjUlTNU586A0u/aFIAqpsPHOH664LRJoSyHidXoHhdqtazgHqR+8YColiNPL1S1bqZ TGnvH8TG8IaBqGvSxR45Pg8naQIdWYtTzeB+UhrxH1CpUI1hR/vyfzHIsl0zkLFrmzgF c3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269228; x=1696874028; 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=YIcOLQi7rOEZO2zRfMF5D3C/NLGqqczvIFQ3scs6Ros=; b=QcHVWBUdvAmUONbUg1pSejeCNU/Poy5KGVYhlWeAmaNKCl8rigoUNGgaG5XLOLp4q3 kgOszQNauYV49ZyHfL1gPH0GfOsd0erJMsU235gIN/6h22pPeCveSZCB+70be/tuBULW 0tuYG0LL0a2XLQW9/ITjOUPED+zqRPwreHVWi/RyVabHcGHFvo/zss2oTDIvt4us980H 5QhtReWhjQvO2UJ46N2XIDPJnJfur0PMW4tJeZ8G5Xe2P9X5yQKlNhVhQizoRxispf1h z9PWaGBY62db79SFZo70Nvwr+OEwh0UNjzv3IDdJW9vwj7WfgAjg7BGH0d03FsZpHOeZ pYdA== X-Gm-Message-State: AOJu0YwbgjstbtCaanSBeK40xSkn1viiYjFLBcxByxuYICFjoO0JPhaD +styjoxJUZLdayBSWN+fSK8= X-Received: by 2002:a05:6402:2792:b0:51a:4d46:4026 with SMTP id b18-20020a056402279200b0051a4d464026mr9627644ede.0.1696269227733; Mon, 02 Oct 2023 10:53:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id e6-20020a056402104600b00536e03f62bcsm5772882edu.59.2023.10.02.10.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:47 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:45 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] staging: rtl8192e: Remove unused/constant parameter mesh_flag and shutdown Message-ID: <5a8f87165b10fd93e3e2fad83ff3380c9f4f22b2.1696266965.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 02 Oct 2023 10:54:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778684341209698323 X-GMAIL-MSGID: 1778684341209698323 Remove parameters mesh_flag and shutdown of function rtllib_softmac_stop_protocol(). mesh_flag is unused. shutdown is always true. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 3 +-- drivers/staging/rtl8192e/rtllib_softmac.c | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 1f3a2bee247f..4e9a0138ce55 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -655,7 +655,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) _rtl92e_cancel_deferred_work(priv); cancel_delayed_work(&priv->rtllib->hw_wakeup_wq); - rtllib_softmac_stop_protocol(priv->rtllib, 0, true); + rtllib_softmac_stop_protocol(priv->rtllib); spin_lock_irqsave(&priv->rf_ps_lock, flags); while (priv->rf_change_in_progress) { spin_unlock_irqrestore(&priv->rf_ps_lock, flags); @@ -1763,7 +1763,7 @@ void rtl92e_commit(struct net_device *dev) if (priv->up == 0) return; - rtllib_softmac_stop_protocol(priv->rtllib, 0, true); + rtllib_softmac_stop_protocol(priv->rtllib); rtl92e_irq_disable(dev); rtl92e_stop_adapter(dev, true); _rtl92e_up(dev); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index bf4ec38efa35..65f29afa81be 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1705,8 +1705,7 @@ void rtllib_DisableNetMonitorMode(struct net_device *dev, bool bInitState); void rtllib_EnableIntelPromiscuousMode(struct net_device *dev, bool bInitState); void rtllib_DisableIntelPromiscuousMode(struct net_device *dev, bool bInitState); -void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, - u8 mesh_flag, u8 shutdown); +void rtllib_softmac_stop_protocol(struct rtllib_device *ieee); void rtllib_softmac_start_protocol(struct rtllib_device *ieee, u8 mesh_flag); void rtllib_reset_queue(struct rtllib_device *ieee); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 777338fd2664..1a086f0ff10d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2279,12 +2279,11 @@ struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee) } EXPORT_SYMBOL(rtllib_get_beacon); -void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, u8 mesh_flag, - u8 shutdown) +void rtllib_softmac_stop_protocol(struct rtllib_device *ieee) { rtllib_stop_scan_syncro(ieee); mutex_lock(&ieee->wx_mutex); - rtllib_stop_protocol(ieee, shutdown); + rtllib_stop_protocol(ieee, true); mutex_unlock(&ieee->wx_mutex); } EXPORT_SYMBOL(rtllib_softmac_stop_protocol); From patchwork Mon Oct 2 17:53:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 147534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1725734vqb; Mon, 2 Oct 2023 15:26:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFbun+z2UylU4DkjRPBqrI4mE+bbhcLz+52NLzm2P+zDSUDU7twIHp+E/kW1dVqYFv2hU/ X-Received: by 2002:a17:90b:33c2:b0:274:3d7d:e793 with SMTP id lk2-20020a17090b33c200b002743d7de793mr10677039pjb.47.1696285573886; Mon, 02 Oct 2023 15:26:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696285573; cv=none; d=google.com; s=arc-20160816; b=ROyVcHaw8uO4tIm3Kv09f9S1515Q+ExiCWaLwOz+81Mmz3/dDRvnqHTfHtvSYUz+/7 cdSdFz1QEeGPzYkyDxc6HLtoAmehLnKMW/qE7YDm8KT5Jh4XHh2OCFwRHSI4hRzXV/Zc pmW21SpsgIORwVn6RCG08XkOP75Ks8aan9m2GEzfBDrYWwysre6rArgUIEw2TMMHc/PL lrFP+opiqWt6h4aBMASQBo9C8wIVJveXCRRJ1OOj6oVLwWv3buEWf8QmvbFrlvH0daFb QhHFkHSlWQPElloieDhBxdDEPAuwP2oZW6RW1O76cF5sdoUNucPeiJnGLM8x9HPhr+xj spWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=76iRx49ZBjTzS3/ihrdEmUB6JBE+9sFOl4sgt+UhoLQ=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=i77HFnQloyU9IKpJPCjwNR48b47Y75tdwNgfaM+JWN7EScFfO+VqYGQn9IEGnyyege STLIdmvF7iXBuDIf8u9Q7VLX2WEYwd2Crn+jn7ZeIIyKzmQQ4P3sJQhyJs63FqAdvxr7 V4VGntqsxlX2XGSGAqYt+HmS7SrafC6i54QCcEfMNqiYybMmeqN0B6Znp+OXTrtoAeik 3pzUdTTniw9ocwFcqT1QaHFSRgo6huiWYqrsKdoS419Ip7Osf6sMgynQ6xpaVolcSzlI VKApnzJG7VcP7/k2X53m1PGFiYEDyLISEllLRZeeiJDh7kE8fpZmyiJfDFx/UOAa0IZT 1l1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lAmREfsc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id x8-20020a17090a8a8800b002791817ea73si8898843pjn.83.2023.10.02.15.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:26:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lAmREfsc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 1F1C6802515E; Mon, 2 Oct 2023 10:54:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238647AbjJBRyG (ORCPT + 18 others); Mon, 2 Oct 2023 13:54:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238607AbjJBRyE (ORCPT ); Mon, 2 Oct 2023 13:54:04 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E97CE4 for ; Mon, 2 Oct 2023 10:54:00 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3233799e7b8so14439f8f.0 for ; Mon, 02 Oct 2023 10:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696269239; x=1696874039; darn=vger.kernel.org; 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=76iRx49ZBjTzS3/ihrdEmUB6JBE+9sFOl4sgt+UhoLQ=; b=lAmREfscTE1emigtGjrRuaD8nRXe6x6R6JZEvedk7T9aFv1qZIQokQkjgD3rf2jpwE BdSCRN61lEusLOy1AVPGw/yUN0w/aYqZuulUcJtX8VSjdaeKs/LaDdxnCnzNHdWbt0z1 HUpnjtE8iQoQOud11QhELFP4IiRhMhVnnzpKPpd8YtwBa4/6seSd+xCy28kF2Kf9VqNh OIH3/DoAiZ3Mxg+z/JZF4ojGSHSXDHnJdJewa0JTnmwObHwR7G6YDDcfDeiNAL4Qmqhv dUpFBhXcjIOpb9ZlFkdDrmyF3D9YYU/DFC/XNMlCKcM+ndzmFIjmIFSNa8TNK6VPQiIL E9kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696269239; x=1696874039; 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=76iRx49ZBjTzS3/ihrdEmUB6JBE+9sFOl4sgt+UhoLQ=; b=iYP6rmy525RYMPEZX75Yj/1sAy7TfA4iGMFyb3goqEOyRFgGjuilF8vHEqsOUtjQmS 9Msmtnws132fUQEomX8Ka3aQjMXd+VA+7hIKQXPifqDiylyIyMejECfc68R55Aaoelx6 KO86PiK5J8L8j/ZGrgI0NVyfHR5B0txac1I+IrJNEbiOj/9cxHigUjVp/qoDJECmzQ7v Lh/sXeCLTYzip5175OwVw6TK0SqEfwQ97CL87jfpnXi9TbCdwl2vnqq5QabnJV8cNaxT c8XfpH+RIqhPjqrNapzxjICSZCUZ22HB6Akda0eRXZ5eal2tTQ+pMtGr20Jv0PmvJLFB 0OBQ== X-Gm-Message-State: AOJu0YxEb3vDb3ZtRXSM7P9nkH30aykcnpFBmh2/TbHFE8AL6U6sKIbi GjvX3RGPvZzpPqS/89BdLoY= X-Received: by 2002:adf:f04b:0:b0:317:630d:1e8e with SMTP id t11-20020adff04b000000b00317630d1e8emr10079014wro.2.1696269238704; Mon, 02 Oct 2023 10:53:58 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id z19-20020a1709063ad300b009a1a653770bsm17455916ejd.87.2023.10.02.10.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:53:58 -0700 (PDT) Date: Mon, 2 Oct 2023 19:53:56 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] staging: rtl8192e: Remove constant parameter from rtllib_stop_protocol() Message-ID: <7eebcd3a8637b686331e34532136df3e7760f869.1696266965.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 02 Oct 2023 10:54:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778684342143816995 X-GMAIL-MSGID: 1778684342143816995 Remove constant parameter shutdown of function rtllib_stop_protocol(). shutdown is always true. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 19 ++++++++----------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +++--- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 65f29afa81be..ff1728d1824d 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1698,7 +1698,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *ieee); void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr); void rtllib_sta_ps_send_pspoll_frame(struct rtllib_device *ieee); void rtllib_start_protocol(struct rtllib_device *ieee); -void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown); +void rtllib_stop_protocol(struct rtllib_device *ieee); void rtllib_EnableNetMonitorMode(struct net_device *dev, bool bInitState); void rtllib_DisableNetMonitorMode(struct net_device *dev, bool bInitState); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 1a086f0ff10d..79a62bd9a297 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2283,21 +2283,19 @@ void rtllib_softmac_stop_protocol(struct rtllib_device *ieee) { rtllib_stop_scan_syncro(ieee); mutex_lock(&ieee->wx_mutex); - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); mutex_unlock(&ieee->wx_mutex); } EXPORT_SYMBOL(rtllib_softmac_stop_protocol); -void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) +void rtllib_stop_protocol(struct rtllib_device *ieee) { if (!ieee->proto_started) return; - if (shutdown) { - ieee->proto_started = 0; - ieee->proto_stoppping = 1; - ieee->rtllib_ips_leave(ieee->dev); - } + ieee->proto_started = 0; + ieee->proto_stoppping = 1; + ieee->rtllib_ips_leave(ieee->dev); del_timer_sync(&ieee->associate_timer); mutex_unlock(&ieee->wx_mutex); @@ -2315,10 +2313,9 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) rtllib_disassociate(ieee); } - if (shutdown) { - RemoveAllTS(ieee); - ieee->proto_stoppping = 0; - } + RemoveAllTS(ieee); + ieee->proto_stoppping = 0; + kfree(ieee->assocreq_ies); ieee->assocreq_ies = NULL; ieee->assocreq_ies_len = 0; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 3c7c0f07ab0b..e9da566646c5 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -134,7 +134,7 @@ int rtllib_wx_set_wap(struct rtllib_device *ieee, } if (ifup) - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); /* just to avoid to give inconsistent infos in the * get wx method. not really needed otherwise @@ -277,7 +277,7 @@ int rtllib_wx_set_mode(struct rtllib_device *ieee, struct iw_request_info *a, if (!ieee->proto_started) { ieee->iw_mode = wrqu->mode; } else { - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); ieee->iw_mode = wrqu->mode; rtllib_start_protocol(ieee); } @@ -401,7 +401,7 @@ int rtllib_wx_set_essid(struct rtllib_device *ieee, } if (proto_started) - rtllib_stop_protocol(ieee, true); + rtllib_stop_protocol(ieee); /* this is just to be sure that the GET wx callback * has consistent infos. not needed otherwise