Received: by 2002:a05:6358:520b:b0:123:56d3:7acd with SMTP id b11csp59139rwa; Sat, 13 May 2023 11:22:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4qW9ounLmqBqeIPzhmoXMrd50ic+o1CuelkSAsyaYdO/dBYZ6cqBlySr8EUKOctbFDIx1+ X-Received: by 2002:a05:6a21:6d84:b0:103:fcd7:544d with SMTP id wl4-20020a056a216d8400b00103fcd7544dmr12099361pzb.47.1684002125939; Sat, 13 May 2023 11:22:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684002125; cv=none; d=google.com; s=arc-20160816; b=eJgGi1FTrGUT2Eg4A5GIz6HtWlBCGQHYdH317uLaYKxQ0CmS3SPWq6qqzL+pcS1BKU dpJC6UDNCzdYP2DrRof2E5oLu7paVSgtzPVs4Yro6xibCyn6qnj32Y1RTeJ6mM10JoIy /FjandU/k1vLff+59QVCH+SF4JS0k6pR/wvTJQ0zkgmf6zmnWWk51q3FiQAzCpwDiFB7 hj8wuJml1qxWPoYUUeYXXETyp+RlSKgHOX7dsPkvVO92ZYB2DA7g9wPb0RJ20ngA2Tep XS8aTpOiRlFynL5z9PEnnRFUJSQBS7IjUjGgAs3CRGnSuWx+rQXcRAZilqfvoP4vY8H7 UmlA== 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=wNF95drdMe2nB4iU+FTUbRjzrVIn7SuCBsnSfgapJkY=; b=OZaNrOmGL0Yi84V14+jyhbJmFM+a5VY9ZSEapfKzuAZLCtc2n9siG3H72VytHdc3Il /Qh1YDeNxaBaoxrxiHbdkl0sq9LiGPaTI9agLFtlQuIjDEXyGuZ95aiOmFtP1KampB5w 7ZGr9qHUbSEM1ZGSRHz5SJf0Oo4otYacADWqMbUvgS5+k6gCMKTSHxNMM8OJAB7ZXTqb PlVBT6/sdsKzlqgBD6+3mKpRgzh6ObC8UJRbrO34tzi0TvrnvEeiRNM+lIrvHeeUoVF0 ZQwzMDG+oPTEhPR2K1p3tmnrOKPrJtm8cNfYu3cKe67u38vW7F2K7+Zovqb7UUSV5Yej eRuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=dlwfiRMk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t29-20020a63b25d000000b005307ce6fd00si6569287pgo.389.2023.05.13.11.21.53; Sat, 13 May 2023 11:22:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b=dlwfiRMk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237716AbjEMSKw (ORCPT + 99 others); Sat, 13 May 2023 14:10:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237586AbjEMSKV (ORCPT ); Sat, 13 May 2023 14:10:21 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7532B49FF for ; Sat, 13 May 2023 11:09:54 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-504d149839bso2614970a12.1 for ; Sat, 13 May 2023 11:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001383; x=1686593383; 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=wNF95drdMe2nB4iU+FTUbRjzrVIn7SuCBsnSfgapJkY=; b=dlwfiRMkQLXkcseVb90U1cEULAs6+E7XraQqo4ZmA5TuxA+R5VZSwGMT7ZIA0OdCvd XqaSnG4xBZegzSI3aO3KB5OrcLcbA/qQbsfOz+JODBDm8/1WxxVtzhS9pf0tkui09hPA UnWFdQ9TgQNjLnhFEs5cGBcqKaebC/qh1VesSnxqxjQPxbF0zTTwpsj+SFEb/V5SWGqg wNQMNu4wucwZnic91pqOdVJjsLxbfCndFWKxNoIGwTecFRBDwNKac7p1HE2zVRoVmjGt xfzwp9NMxqRE/5dfZN+nENrwjzeafL1WaIohLgfFlvvMe6iFntHVd59KkTLmwzmMnEfz +Xzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001383; x=1686593383; 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=wNF95drdMe2nB4iU+FTUbRjzrVIn7SuCBsnSfgapJkY=; b=PpqQt92qBV02/M97+mT3TN7gGwsJaL8UaU5Ke4NHGjcsimFbQOdxzUnGsinQTPAw6q er+NLyYniZ4j3Lm2tx0MWy/DCNcB9clzRR6NMLMrrWnPbRCM8mJmX0h5qNyU0zhnw+ik XDOIuZgu/mpGbTvb7gCNtJVOEvpVDW5sd69V64wYovLtpluHiNT0ctrq63L/q1T9nIpR JKkr34RwfI7OFKiSXTXxJcIfbNrgE790IB5hvvyW9O17GGUEjfwK0BxAIJCd9LEaXNWZ SJWDLzMEZ2UnCXHbnFiH9Ln58oLxZMAnc+r/ef84w+XuDSUi9aa2MIDFvPJMVGE2VCgX HjDA== X-Gm-Message-State: AC+VfDxELUjxypFbKkyuKWL/2t4WRoga4XwUoscA1bheLctyLJ81KSRY uNGe5Sj0AIoVeP45ZMxuu4QZfziNxBM= X-Received: by 2002:a17:906:74d1:b0:965:9602:3ef0 with SMTP id z17-20020a17090674d100b0096596023ef0mr25591824ejl.0.1684001383077; Sat, 13 May 2023 11:09:43 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id d4-20020a170907272400b00965e9b435dfsm7065022ejl.65.2023.05.13.11.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:42 -0700 (PDT) Date: Sat, 13 May 2023 20:09:40 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 9/9] staging: rtl8192e: Remove undefined function LedControlHandler Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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,T_SCC_BODY_TEXT_LINE 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 Remove function LedControlHandler as it is not defined. Remove resulting unused local variables bLedBlinking, type, fc and LedAction. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 26 ------------------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 --- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 10 ------- 5 files changed, 46 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index c612e31d1a84..d9d056d18fa3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -46,7 +46,6 @@ static void _rtl92e_update_msr(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); u8 msr; - enum led_ctl_mode LedAction = LED_CTL_NO_LINK; msr = rtl92e_readb(dev, MSR); msr &= ~MSR_LINK_MASK; @@ -55,7 +54,6 @@ static void _rtl92e_update_msr(struct net_device *dev) case IW_MODE_INFRA: if (priv->rtllib->state == RTLLIB_LINKED) msr |= MSR_LINK_MANAGED; - LedAction = LED_CTL_LINK; break; case IW_MODE_ADHOC: if (priv->rtllib->state == RTLLIB_LINKED) @@ -70,8 +68,6 @@ static void _rtl92e_update_msr(struct net_device *dev) } rtl92e_writeb(dev, MSR, msr); - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, LedAction); } void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 5fdee7b54f24..17b70dde7eeb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -737,8 +737,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) priv->rtllib->InitialGainHandler = rtl92e_init_gain; priv->rtllib->rtllib_ips_leave_wq = rtl92e_rtllib_ips_leave_wq; priv->rtllib->rtllib_ips_leave = rtl92e_rtllib_ips_leave; - - priv->rtllib->LedControlHandler = NULL; priv->rtllib->ScanOperationBackupHandler = rtl92e_scan_op_backup; } @@ -1272,10 +1270,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) ieee->is_roaming = true; ieee->is_set_key = false; ieee->link_change(dev); - if (ieee->LedControlHandler) - ieee->LedControlHandler(ieee->dev, - LED_CTL_START_TO_LINK); - notify_wx_assoc_event(ieee); if (!(ieee->rtllib_ap_sec_type(ieee) & @@ -1506,7 +1500,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) MAX_DEV_ADDR_SIZE); struct tx_desc *pdesc = NULL; struct rtllib_hdr_1addr *header = NULL; - u16 fc = 0, type = 0; u8 *pda_addr = NULL; int idx; u32 fwinfo_size = 0; @@ -1522,8 +1515,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) fwinfo_size = sizeof(struct tx_fwinfo_8190pci); header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size); - fc = le16_to_cpu(header->frame_ctl); - type = WLAN_FC_GET_TYPE(fc); pda_addr = header->addr1; if (!is_broadcast_ether_addr(pda_addr) && !is_multicast_ether_addr(pda_addr)) @@ -1545,11 +1536,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) spin_unlock_irqrestore(&priv->irq_th_lock, flags); return skb->len; } - - if (type == RTLLIB_FTYPE_DATA) { - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, LED_CTL_TX); - } rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, skb); __skb_queue_tail(&ring->queue, skb); pdesc->OWN = 1; @@ -1776,8 +1762,6 @@ static void _rtl92e_rx_normal(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); struct rtllib_hdr_1addr *rtllib_hdr = NULL; bool unicast_packet = false; - bool bLedBlinking = true; - u16 fc = 0, type = 0; u32 skb_len = 0; int rx_queue_idx = RX_MPDU_QUEUE; @@ -1821,16 +1805,6 @@ static void _rtl92e_rx_normal(struct net_device *dev) /* unicast packet */ unicast_packet = true; } - fc = le16_to_cpu(rtllib_hdr->frame_ctl); - type = WLAN_FC_GET_TYPE(fc); - if (type == RTLLIB_FTYPE_MGMT) - bLedBlinking = false; - - if (bLedBlinking) - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, - LED_CTL_RX); - skb_len = skb->len; if (!rtllib_rx(priv->rtllib, skb, &stats)) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c index 0bb657fda06c..8b656980ee25 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -421,10 +421,6 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, mutex_unlock(&priv->rtllib->ips_mutex); } rtllib_stop_scan(priv->rtllib); - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, - LED_CTL_SITE_SURVEY); - if (priv->rtllib->rf_power_state != rf_off) { priv->rtllib->actscanning = true; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 8bafee31e50c..4aa5ce9f7792 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1716,8 +1716,6 @@ struct rtllib_device { void (*InitialGainHandler)(struct net_device *dev, u8 Operation); void (*ScanOperationBackupHandler)(struct net_device *dev, u8 Operation); - void (*LedControlHandler)(struct net_device *dev, - enum led_ctl_mode LedAction); void (*SetHwRegHandler)(struct net_device *dev, u8 variable, u8 *val); void (*AllowAllDestAddrHandler)(struct net_device *dev, diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 1fe0675033cb..18885cda60f6 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1680,9 +1680,6 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee, false; ieee->state = RTLLIB_ASSOCIATING; - if (ieee->LedControlHandler != NULL) - ieee->LedControlHandler(ieee->dev, - LED_CTL_START_TO_LINK); schedule_delayed_work( &ieee->associate_procedure_wq, 0); } else { @@ -2343,10 +2340,6 @@ rtllib_rx_deauth(struct rtllib_device *ieee, struct sk_buff *skb) ieee->link_detect_info.bBusyTraffic = false; rtllib_disassociate(ieee); RemovePeerTS(ieee, header->addr2); - if (ieee->LedControlHandler != NULL) - ieee->LedControlHandler(ieee->dev, - LED_CTL_START_TO_LINK); - if (!(ieee->rtllib_ap_sec_type(ieee) & (SEC_ALG_CCMP|SEC_ALG_TKIP))) schedule_delayed_work( @@ -2641,9 +2634,6 @@ static void rtllib_start_ibss_wq(void *data) ieee->link_change(ieee->dev); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); - if (ieee->LedControlHandler != NULL) - ieee->LedControlHandler(ieee->dev, LED_CTL_LINK); - rtllib_start_send_beacons(ieee); notify_wx_assoc_event(ieee); -- 2.40.1