From patchwork Tue Nov 8 18:09:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak R Varma X-Patchwork-Id: 17152 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2869354wru; Tue, 8 Nov 2022 10:14:36 -0800 (PST) X-Google-Smtp-Source: AMsMyM7k/nETHbFcDvl/XypVMGVtYF6/dJIKSoM649/BknzqqfprXtbok8K8QA1lMJ5lyfaoYKBU X-Received: by 2002:a17:90a:e7c3:b0:213:c304:1d56 with SMTP id kb3-20020a17090ae7c300b00213c3041d56mr53349344pjb.62.1667931276044; Tue, 08 Nov 2022 10:14:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667931276; cv=none; d=google.com; s=arc-20160816; b=SXAzitQb1ULyy7W3C10RCjSXhZOIwq6LMGcxRmVqcURkJgFESftZiOrD2Ani1EkGP+ 6cE8JidxvEZG/eQJe1uDM/N0vGMNPcP8Fdi25O+URGsJIDV6MP7AKbDufpBhQekScDhf 8kNfQwSaZjvCwJew1VJBWDrAp6rxeQsO9UEf7aqs5Be3oViwtGJhQ+Zkk0HGeRcr39Eg WJjmVqfXWjVbS5rzGdRBKA2j7r+begWakmtf11AttqUTg8XGPIP1muYq9kgIwGyphV4f e53E9l8FHJuYdAWVRlSN0tbVYMa4IAvGPc2qwMnDRfVv8ErZCBKvdvVInZpMsW+Dd0+W YkqA== 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=MisWfW2BMYpe2Rqfv1ID3mFbxxRuUnzngVRkdRWfjdI=; b=djIFRbLyTXaAn1w/t3wbLNNFWAh4GM6GcG+VUTzb0B452+7qDFyRPRzCZYfCGTA0b5 jC1QlREQWPNvoyvvz++1iY+kViQYmL9LSlVXojNcKNg7YgFV3Z43P/w/MyJdEEt5p9BS Zod0VA38Ehefy9urEhkNze/9bSgj9l0VNrUzJyCmugCLZ1qBBWLH3oaQG61eL5yWad9n Rsm0JKan/R7fO3Mqi+bTeCYODtCfZ9vz/ezpPhEt9sIKj2Pq07nzVH6YKeL8CK+O3aNF 2RWSjovpurZFZgIyeLaf7FLGVfx35l5QSsu/lA93N9FpTFu35Mo3DULA3fte0l3Umzeh 4gcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@mailo.com header.s=mailo header.b=O+a0JuJd; 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=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t6-20020a170902e84600b0018729febdaesi16832387plg.122.2022.11.08.10.14.20; Tue, 08 Nov 2022 10:14:36 -0800 (PST) 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=fail header.i=@mailo.com header.s=mailo header.b=O+a0JuJd; 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=fail (p=NONE sp=NONE dis=NONE) header.from=mailo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234645AbiKHSKx (ORCPT + 99 others); Tue, 8 Nov 2022 13:10:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234739AbiKHSKt (ORCPT ); Tue, 8 Nov 2022 13:10:49 -0500 Received: from msg-1.mailo.com (msg-1.mailo.com [213.182.54.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1858E1C423 for ; Tue, 8 Nov 2022 10:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailo.com; s=mailo; t=1667931037; bh=oGtExssGV7LHMlhkrkJ4t/rQVhHQzwTERr7TlBc+xv0=; h=X-EA-Auth:Date:From:To:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=O+a0JuJdi9TOLCDEQGKCsdnfX+q9sYWV6JgBpgeil5tkR+FJIoJ2VnNF0DOmscaG7 aPmFsqmAh4niq1cwVroz5ZIeapHKZTv8h2lVrunZD3L0c0yT3dZC7/pWj+YSElF9I0 5C8MoUpi8pSGEM+didiU1oKM0whfAcMCf1bXSay4= Received: by b-6.in.mailobj.net [192.168.90.16] with ESMTP via ip-206.mailobj.net [213.182.55.206] Tue, 8 Nov 2022 19:10:36 +0100 (CET) X-EA-Auth: jRsr2yFHIAty5Q1EnNGuaHmLSfrZgKKr4kToJcOFecmtUnzTvIRX4KbwOskOW0oQ1rEqgEenenbxTHP4gBxXMY3WJr3+JRfw Date: Tue, 8 Nov 2022 23:39:56 +0530 From: Deepak R Varma To: outreachy@lists.linux.dev, gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v5 1/1] staging: rtl8192u: remove redundant macro definitions Message-ID: <17f69a042e215c484931a0327fdf7775eea5f918.1667930292.git.drv@mailo.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,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748952705806501700?= X-GMAIL-MSGID: =?utf-8?q?1748952705806501700?= Several ieee80211_* symbol names are extended with _rsl tag using macros. This is done to avoid a conflict when a similar symbol is already in use in another part of kernel and may lead to conflicts. However, most of these base symbol names are not found to being used anywhere in the code and hence are not useful today. These symbols are not used outside of the module and hence can be safely removed. The code continues to use the original symbol names. Suggested-by: Greg Kroah-Hartman Signed-off-by: Deepak R Varma --- Changes in v5: 1. None. Resubmitting as the mail threading had issues. Changes in v4: 1. Resubmit patch set with the remaining only patch. Update patch subject, version and patch sequence number to avoid confusion. Suggested by gregkh@linuxfoundation.org. Changes in v3: 1. The patch caused a build failure due to EXPORT_SYMBOL conflict across modules. Retain macro defines for ieee80211_wake_queue and ieee80211_stop_queue to avoid EXPORT_SYMBOL conflict caused by similar function names from net/mac80211 module. Correction and resubmission asked by gregkh@linuxfoundation.org Changes in v2: 1. Review other similar macro defines and clean those up as well. Suggested by gregkh@linuxfoundation.org 2. Revise patch log to explain impact of the patch Suggested by julia.lawall@inria.fr .../staging/rtl8192u/ieee80211/ieee80211.h | 61 ------------------- 1 file changed, 61 deletions(-) -- 2.34.1 diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index 00c07455cbb3..c5c43d2fb93e 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -223,71 +223,10 @@ struct cb_desc { #define MAX_IE_LEN 0xff // added for kernel conflict -#define ieee80211_crypt_deinit_entries ieee80211_crypt_deinit_entries_rsl -#define ieee80211_crypt_deinit_handler ieee80211_crypt_deinit_handler_rsl -#define ieee80211_crypt_delayed_deinit ieee80211_crypt_delayed_deinit_rsl -#define ieee80211_register_crypto_ops ieee80211_register_crypto_ops_rsl -#define ieee80211_unregister_crypto_ops ieee80211_unregister_crypto_ops_rsl -#define ieee80211_get_crypto_ops ieee80211_get_crypto_ops_rsl - -#define ieee80211_ccmp_null ieee80211_ccmp_null_rsl - -#define free_ieee80211 free_ieee80211_rsl -#define alloc_ieee80211 alloc_ieee80211_rsl - -#define ieee80211_rx ieee80211_rx_rsl -#define ieee80211_rx_mgt ieee80211_rx_mgt_rsl - -#define ieee80211_get_beacon ieee80211_get_beacon_rsl #define ieee80211_wake_queue ieee80211_wake_queue_rsl #define ieee80211_stop_queue ieee80211_stop_queue_rsl -#define ieee80211_reset_queue ieee80211_reset_queue_rsl -#define ieee80211_softmac_stop_protocol ieee80211_softmac_stop_protocol_rsl -#define ieee80211_softmac_start_protocol ieee80211_softmac_start_protocol_rsl -#define ieee80211_is_shortslot ieee80211_is_shortslot_rsl -#define ieee80211_is_54g ieee80211_is_54g_rsl -#define ieee80211_wpa_supplicant_ioctl ieee80211_wpa_supplicant_ioctl_rsl -#define ieee80211_ps_tx_ack ieee80211_ps_tx_ack_rsl -#define ieee80211_softmac_xmit ieee80211_softmac_xmit_rsl -#define ieee80211_stop_send_beacons ieee80211_stop_send_beacons_rsl #define notify_wx_assoc_event notify_wx_assoc_event_rsl #define SendDisassociation SendDisassociation_rsl -#define ieee80211_disassociate ieee80211_disassociate_rsl -#define ieee80211_start_send_beacons ieee80211_start_send_beacons_rsl -#define ieee80211_stop_scan ieee80211_stop_scan_rsl -#define ieee80211_send_probe_requests ieee80211_send_probe_requests_rsl -#define ieee80211_softmac_scan_syncro ieee80211_softmac_scan_syncro_rsl -#define ieee80211_start_scan_syncro ieee80211_start_scan_syncro_rsl - -#define ieee80211_wx_get_essid ieee80211_wx_get_essid_rsl -#define ieee80211_wx_set_essid ieee80211_wx_set_essid_rsl -#define ieee80211_wx_set_rate ieee80211_wx_set_rate_rsl -#define ieee80211_wx_get_rate ieee80211_wx_get_rate_rsl -#define ieee80211_wx_set_wap ieee80211_wx_set_wap_rsl -#define ieee80211_wx_get_wap ieee80211_wx_get_wap_rsl -#define ieee80211_wx_set_mode ieee80211_wx_set_mode_rsl -#define ieee80211_wx_get_mode ieee80211_wx_get_mode_rsl -#define ieee80211_wx_set_scan ieee80211_wx_set_scan_rsl -#define ieee80211_wx_get_freq ieee80211_wx_get_freq_rsl -#define ieee80211_wx_set_freq ieee80211_wx_set_freq_rsl -#define ieee80211_wx_set_rawtx ieee80211_wx_set_rawtx_rsl -#define ieee80211_wx_get_name ieee80211_wx_get_name_rsl -#define ieee80211_wx_set_power ieee80211_wx_set_power_rsl -#define ieee80211_wx_get_power ieee80211_wx_get_power_rsl -#define ieee80211_wlan_frequencies ieee80211_wlan_frequencies_rsl -#define ieee80211_wx_set_rts ieee80211_wx_set_rts_rsl -#define ieee80211_wx_get_rts ieee80211_wx_get_rts_rsl - -#define ieee80211_txb_free ieee80211_txb_free_rsl - -#define ieee80211_wx_set_gen_ie ieee80211_wx_set_gen_ie_rsl -#define ieee80211_wx_get_scan ieee80211_wx_get_scan_rsl -#define ieee80211_wx_set_encode ieee80211_wx_set_encode_rsl -#define ieee80211_wx_get_encode ieee80211_wx_get_encode_rsl -#define ieee80211_wx_set_mlme ieee80211_wx_set_mlme_rsl -#define ieee80211_wx_set_auth ieee80211_wx_set_auth_rsl -#define ieee80211_wx_set_encode_ext ieee80211_wx_set_encode_ext_rsl -#define ieee80211_wx_get_encode_ext ieee80211_wx_get_encode_ext_rsl struct ieee_param {