From patchwork Fri Dec 8 18:19:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 175999 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5636330vqy; Fri, 8 Dec 2023 10:20:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IEME/oN5Fu9mKw6Yy54seRzbk6jY+pzQfdTyTKG6UA592ItbLnzB0mrNjGgy90YiV/9kRIA X-Received: by 2002:a17:90a:73c6:b0:286:74c7:4250 with SMTP id n6-20020a17090a73c600b0028674c74250mr472698pjk.38.1702059607197; Fri, 08 Dec 2023 10:20:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702059607; cv=none; d=google.com; s=arc-20160816; b=c4pFCye+kY4e6FJ6E9L2XWRbHHPYXg5j2NnJzrPKdz8VlKidaBXd3RUdRl40+p332R D0zB3B2qG7LDb6hcG/wdZAtFk7ZT948IYpmsrtUqlgy44UuwfjDhxnPzRa5pkoGKRFA5 4D441TYa/LTFntPJGvQQUIu1UlQddf6JSUHL4vkzCeuFXB9f6eLAjDPr290MJHMjLbQ7 qhhR0qcKwEi5LqvZY/dH7DNznJFEaMZN7El8xzbQH4ashGo3kl8ukHxWW+mLf7mUM5yb NLK6jT9b+y0QzVli5eFxf/Khyp3Bydftw/3PGgDE+eo7NglnjN0SRJdDgJ4jEXW2+5iS aJSw== 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=3+GiMKSFFjg4ZMw0A4N/m/YEPbPCxTc/5rQWQIRaPIU=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=sYRNUo0Uo/uq7y8oy5j9luqpPvOntbHgbsBPZNMs/7b8fcGsnTYdE+nOKboOHml+h7 4RYBVTIBJZEU5xwmdLhu7moaRI6TrHDtyWNVGTNXfav32yPfGia8D8DV2NN3kFdZkx5X dCPk9Zd7a3aStgLJmaL643PtSwZSLH9lRhgpGuHAvkovtgxT8dy2ydVBJFZ+76wn4mQk E/g4+ihkNk0dG2i65/Fn1q2+xmusvqIRL5XFlXxv5FKajtRPKKE2wPjbHVh5D9VObvr2 BQ/YHawdhuk2FVz6jEW7iZP2X77x/tdvbj46e3fizvKYiXEppm/uMl3/Kw+SCqoxy6mm G9Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aGMhPjcy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id o11-20020a17090ab88b00b002868f5b2c7csi1421754pjr.33.2023.12.08.10.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:20:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aGMhPjcy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 1854582663F2; Fri, 8 Dec 2023 10:19:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1574566AbjLHSTu (ORCPT + 99 others); Fri, 8 Dec 2023 13:19:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1574560AbjLHSTs (ORCPT ); Fri, 8 Dec 2023 13:19:48 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A499F10DF for ; Fri, 8 Dec 2023 10:19:54 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a1d48f0223dso65253266b.0 for ; Fri, 08 Dec 2023 10:19:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702059593; x=1702664393; 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=3+GiMKSFFjg4ZMw0A4N/m/YEPbPCxTc/5rQWQIRaPIU=; b=aGMhPjcyOMo0IMdWGMFMCLDTB+60RmW2B8FKNhhD9z2m83nNKwTzzzLG4e1gpO8v+r QWD94wbylf1EnhzlikoxbpBBY8cAnw3K3SQwfMyQVdsvLQkH8XXf6CdfuErAQcDEIj2v A6Hubd7gC8ih3977XG+KOJEnlDbXzufV9+b3Gbwkbi30NVSW5JTu/S2xugAvqp9I7cHe 4r4Zx06XIkU35bHfvkPvc17DXr3JYVGO4uE/DDPVzw6b4mv/+QrATvTXVnrT2KiZvMLZ VKhivfVTiZBQDYEw1gN1SAYU7EZeiEcMBxWuxn1r668t1srWDw+eGmkg83CqVB/mFof5 0TUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702059593; x=1702664393; 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=3+GiMKSFFjg4ZMw0A4N/m/YEPbPCxTc/5rQWQIRaPIU=; b=b0NZGBYPaiul9VZSRFsKHytBAGITuQ5XYxvhVvc2tTVWl1wlQ0f+CHLcWbVdwgvya8 wTASRxPUCrDwZl1raJe53IXchdwoxpKabwwpvH2VI2of1CbzKpS69MXipzLQPL1THTnw /2VcndJeEhXKlUsNpp8KXTNTdUHU3UURbbUG63A1UEPxWtULrtxBWbKNgGRbXyhXQaaD fL5BNbZp9Qfdd5PlDmio96rXi8S9IeywaSp+rurYNeJbDg8pO289dwRC9lsegGqWTRYp dDdIs9o38Z6Qup8Sb5aooduCDPGpdB85IzuZ8kJ1wt7XrFUIzJ3JCpjPgmoi5Sa8oY5D YO8g== X-Gm-Message-State: AOJu0YxM45UcalBg5ONsP63LmoG1t5g24JuOmgaLEQ5b10POBbQBxNrI Yc/YThk14RaLLgZt3mu3nSY= X-Received: by 2002:a17:907:d384:b0:a1b:1daf:8270 with SMTP id vh4-20020a170907d38400b00a1b1daf8270mr485532ejc.5.1702059593003; Fri, 08 Dec 2023 10:19:53 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id tf13-20020a1709078d8d00b00a1b8829597fsm1260423ejc.114.2023.12.08.10.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 10:19:52 -0800 (PST) Date: Fri, 8 Dec 2023 19:19:51 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] staging: rtl8192e: Remove variable dot11d_info Message-ID: <2438971feb0c02c5c72776f57201a4011f249190.1701989555.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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Fri, 08 Dec 2023 10:20:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784738854642107973 X-GMAIL-MSGID: 1784738854642107973 Remove variable dot11d_info as it is unused. Remove unused struct channel_list and empty struct rt_dot11d_info. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/dot11d.c | 5 ----- drivers/staging/rtl8192e/dot11d.h | 6 ------ drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 6 ------ 4 files changed, 18 deletions(-) diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c index c44ff26e8d61..8d89f962b3bf 100644 --- a/drivers/staging/rtl8192e/dot11d.c +++ b/drivers/staging/rtl8192e/dot11d.c @@ -7,11 +7,6 @@ ******************************************************************************/ #include "dot11d.h" -struct channel_list { - u8 channel[32]; - u8 len; -}; - void dot11d_channel_map(struct rtllib_device *ieee) { diff --git a/drivers/staging/rtl8192e/dot11d.h b/drivers/staging/rtl8192e/dot11d.h index d047283f2ceb..98aa28d0cf72 100644 --- a/drivers/staging/rtl8192e/dot11d.h +++ b/drivers/staging/rtl8192e/dot11d.h @@ -18,12 +18,6 @@ * 2 - valid (passive scan) */ -struct rt_dot11d_info { -}; - -#define GET_DOT11D_INFO(__ieee_dev) \ - ((struct rt_dot11d_info *)((__ieee_dev)->dot11d_info)) - void dot11d_channel_map(struct rtllib_device *ieee); #endif diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index ec720f776639..51dcea57a329 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1320,7 +1320,6 @@ struct rtllib_device { u16 scan_watch_dog; /* map of allowed channels. 0 is dummy */ - void *dot11d_info; u8 active_channel_map[MAX_CHANNEL_NUMBER+1]; int rate; /* current rate */ diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index fdb0e76d20b0..3c92eb401e8c 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2077,9 +2077,6 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->link_state = MAC80211_NOLINK; for (i = 0; i < 5; i++) ieee->seq_ctrl[i] = 0; - ieee->dot11d_info = kzalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC); - if (!ieee->dot11d_info) - return -ENOMEM; ieee->link_detect_info.SlotIndex = 0; ieee->link_detect_info.SlotNum = 2; @@ -2153,9 +2150,6 @@ void rtllib_softmac_free(struct rtllib_device *ieee) cancel_work_sync(&ieee->ips_leave_wq); cancel_work_sync(&ieee->wx_sync_scan_wq); cancel_work_sync(&ieee->ps_task); - - kfree(ieee->dot11d_info); - ieee->dot11d_info = NULL; } static inline struct sk_buff *