From patchwork Sun Feb 19 21:16:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006476wrn; Sun, 19 Feb 2023 13:22:34 -0800 (PST) X-Google-Smtp-Source: AK7set9TWXn/nMXZwEbY8naQv6XQvLNnCCRmv1c4vOecHqnzAc1d58oI7CKAIRTyGrwYsStgr4Qm X-Received: by 2002:a17:907:6d10:b0:8b1:72e4:d734 with SMTP id sa16-20020a1709076d1000b008b172e4d734mr15652875ejc.23.1676841754312; Sun, 19 Feb 2023 13:22:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841754; cv=none; d=google.com; s=arc-20160816; b=kZEEW/Rtrvn31bX5JJi6+V1i5wPYxbi46YCJ/sDeb+h8IMZz488Hm4QdgBW6QUAVO/ uM9jEzi1sf5CvHRdGNjrXIjQWiXRHvjJ6bIp86x1BbBKRkiLf5kkmsMcgLoVMlYkXcXs sylJIJsp/Yb/ksc3biBSn0cNuPz72HU7Df2GRjLi8KlKAEONgtnL4c2aGz77r82VFPX7 MiTHVZgIjv6vCV+4FPx4Pd1wVYbBIO9rBu9czOZ4o0nU2CiRCGGH9twLHxGKWFx4QXmP v3AoEA702qcsKBFH2JS0RcetVT21pVGRtyoT1WxHCOSeJDgaWcS4gfC/jvdUCpzLi67D fsuw== 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=gD2rpGXNjlPg34upTQh8s57+lHo2lH56WRqivcs5WEk=; b=IP7hqjvg43dkSEFV4b7TgqFMIMBQ0NtbvMbORRM0hrscL1AGZ1/jjTBid1AptjKxFc IY+sDeOIAXCtiG4fFryh4yEhRvMa/oqFrlukH1spgcgjIGOlgXL9vM2YMi7/14K0ugKb wsSB3s+ysDBfPYv6X4eCzR3ipcW2bdHuRqfOm5XKXvEYy3sVBn/3uWUOc54CNe+oqmqJ tp+CXHAvS2xYgBroevd6Mg4V0K76hPHUoKN4rDtpjCk8FasWjwWnYn8KLs7OECFNJuIH 49y8HGTszVI0RYSbTtRsGQY+7wq652xk9gs9ix1Bp3TapF6uD2pq8nPIKEKtHfLw4VeG AA6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=boERJx4w; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p10-20020a170907910a00b008cdf4a9c9a8si2320375ejq.496.2023.02.19.13.22.11; Sun, 19 Feb 2023 13:22:34 -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=pass header.i=@gmail.com header.s=20210112 header.b=boERJx4w; 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 S231684AbjBSVQ7 (ORCPT + 99 others); Sun, 19 Feb 2023 16:16:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231681AbjBSVQ5 (ORCPT ); Sun, 19 Feb 2023 16:16:57 -0500 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 AC0F5196B0 for ; Sun, 19 Feb 2023 13:16:37 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id ek25so4564907edb.7 for ; Sun, 19 Feb 2023 13:16:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=gD2rpGXNjlPg34upTQh8s57+lHo2lH56WRqivcs5WEk=; b=boERJx4wS/f5Wk73N/ZrWa6GVJSzGagQ8WkeKshregS60glZLVU8KHw+IVMiiIG2Lp Hl/Ubca2fSkELXHLdUSsyFdRyOkFTW2+WqkupbxRdfIqC+avxnnSYh6/tsb6fdcr7Upd iUpAX5vpO2vrfGyZ5O0soTFojFk7Xzv4IR5fAv/cG2syPk+ZAspCq6G2eIORzDPSaBCk 1g84Zs2MSXyEDsJDw/oDKsWVEiUeJeL5v7Rd124VFWjJ0VChJR/OJTfGzQwiXDf0/ERk yFZYahcSjuINbPPPbJIfc05P5zEQC4J21LR8YBkr1xpKUviJG2FZX/0l38EZ1Rp4fUje D5iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=gD2rpGXNjlPg34upTQh8s57+lHo2lH56WRqivcs5WEk=; b=XsHAV8UOBP1ZUrHoBIu0zixc3+NX0Ah0v4BXZnZKTMKpRz/jEODzf2IbiTCZb8ZZwX 1PqS2wvUmU5/1o8LHqTpyer8dCGf70eP/IzrAlVJ1fBSNhVvTHpPyn9gkclMprty5Tcn tkOE1JOq3E5Hc9SwETvJvX5BZfPWsm1BgQ6qsr+YE0AaUZ4PAkHvdtzrZElxRHCHFvTD EkrsP9+uWFD0hzGzMI8SkP4U21f+G9uwGN/5fayRS53TDwUquZLdDYGXCjG/DJv9ZFVj 23l2HGAImKFLVbij+pwVkgwHAeIFX2WXE9XDiW/KeKJuAbHMQ7LxHMlZeJf37DithCj5 fGDQ== X-Gm-Message-State: AO0yUKVegPHlvD++AW7oWLMTMwj3XEIkja7LbKmUPWO2h+Ld17uo0h+c cdgA/1aJy28M4tOt/VzVsWo= X-Received: by 2002:a17:906:19c:b0:88d:5f84:2756 with SMTP id 28-20020a170906019c00b0088d5f842756mr7492894ejb.0.1676841390964; Sun, 19 Feb 2023 13:16:30 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id a36-20020a509ea7000000b004a7e9ec2087sm5223332edf.76.2023.02.19.13.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:16:30 -0800 (PST) Date: Sun, 19 Feb 2023 22:16:28 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] staging: rtl8192e: Remove entry .update_ratr_t.. from struct rtl819x_ops Message-ID: 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758296019476721863?= X-GMAIL-MSGID: =?utf-8?q?1758296019476721863?= Remove entry .update_ratr_table and replace it with function name rtl92e_update_ratr_table. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 0b5b2ae27f9e..1e307789ee93 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -806,7 +806,7 @@ void rtl92e_link_change(struct net_device *dev) if (ieee->state == RTLLIB_LINKED) { _rtl92e_net_update(dev); - priv->ops->update_ratr_table(dev); + rtl92e_update_ratr_table(dev); if ((ieee->pairwise_key_type == KEY_TYPE_WEP40) || (ieee->pairwise_key_type == KEY_TYPE_WEP104)) rtl92e_enable_hw_security_config(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 566513338089..c7561e486359 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -29,7 +29,6 @@ static const struct rtl819x_ops rtl819xp_ops = { .nic_type = NIC_8192E, .link_change = rtl92e_link_change, .rx_command_packet_handler = NULL, - .update_ratr_table = rtl92e_update_ratr_table, .irq_enable = rtl92e_enable_irq, .irq_disable = rtl92e_disable_irq, .irq_clear = rtl92e_clear_irq, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 083bba3dc51b..10ff4f9ec760 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -210,7 +210,6 @@ struct rtl819x_ops { bool (*rx_command_packet_handler)(struct net_device *dev, struct sk_buff *skb, struct rx_desc *pdesc); - void (*update_ratr_table)(struct net_device *dev); void (*irq_enable)(struct net_device *dev); void (*irq_disable)(struct net_device *dev); void (*irq_clear)(struct net_device *dev);