From patchwork Sun Feb 19 21:15:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1005921wrn; Sun, 19 Feb 2023 13:20:18 -0800 (PST) X-Google-Smtp-Source: AK7set+e/8P/kV6SFxtTKEFVXv1ReTIhXUrQHLCDGxWeZXl9OrQsaVc0PslN/TNUqHmQdOVJQgGr X-Received: by 2002:a05:6402:43cb:b0:4ab:1715:2858 with SMTP id p11-20020a05640243cb00b004ab17152858mr993392edc.11.1676841618407; Sun, 19 Feb 2023 13:20:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841618; cv=none; d=google.com; s=arc-20160816; b=iPt4ONYfJ4iaAyrEAmChXxw9+oML1VUQcK+R6azSoFgw6maUk6Ao94ZO9Xv9YCrMCK rdbp/TrG61990kqnsaPakNl8zarVnUExo2AwMWYvAAQAZk/fZViJ46zpBhKry2/mbif3 601pS+vtthKT75oMNhcGsTCiMmP4rUv76BB6bYWEKCegi0JW4hXB0EcP5/zLI91cXbtJ Gwe5DvwN7E0g2IvrgVVqc6O8SrkRXcm+Y5IS2IHfEskvhrCpls2bGTHUhNj79NrVkk+s MSe6TfeuTVVs0pKyUZwLDGoBpmQtPXsj+9PclRDw6XrRIgjT57E5xdvWf608EogbTyJb XJdg== 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=FnARXeUlH8SP3sL9hF5FqRg/oldYCWKd88vCzYsrVf8=; b=XHDj7N4n2udOruDbOewCRSLekW2gund2PTQsQbh5EyFtK4zOS8Mtvl4ZUmW3HiZ071 MHVSyeW0N8Wz2i0rcByGJEdHSDPDMu0p1CfE1/oZUNTHi5S8+CkkMdyKymETrXm2GDxl dRYlAhOvdtNDTwKgHBowO72TTdN9/sK8k2Ae06CiTQezrzVWw/+BH6qiLFuLY0atELE0 BWOwJMU3cQ2mI8quLC7rCbCcHfC2uG+pr5D2JnWahL0kgYH0bqhjuCCFPHKe2kYCqhHD FrYx1WWP9hvmLG6nabG/UomFIfFZ+FoKhpJ4KtlJv9RHIZEnqP35DI69bi4jE/A9DAfA 27UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=gmOVl9Jb; 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 c22-20020aa7df16000000b004accf2ae2f1si11562920edy.586.2023.02.19.13.19.55; Sun, 19 Feb 2023 13:20:18 -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=gmOVl9Jb; 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 S231648AbjBSVPk (ORCPT + 99 others); Sun, 19 Feb 2023 16:15:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231645AbjBSVPj (ORCPT ); Sun, 19 Feb 2023 16:15:39 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E107F199C4 for ; Sun, 19 Feb 2023 13:15:37 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id x22so4870543edd.10 for ; Sun, 19 Feb 2023 13:15:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841336; 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=FnARXeUlH8SP3sL9hF5FqRg/oldYCWKd88vCzYsrVf8=; b=gmOVl9JbMjaOA0bu1b5yHXa9Qw1edQArY83Zk2Z0JkwuCCXShjPrNavDcwtpO7F0j4 v7mKMxB5DZXmn+oLeE2qJvQXh9/ncC/dFedduKdffqhEsDiVN6J4LgRwJUt84w1ihcVl 3ZX8P2LHk03Tie/TPn9rVs493XforbGL2dG/j/h/dZsqsX/NWaKEUEh0WEHio5B5CuIx aflqrSMlKooqM0T7usi9vsKHFkdCBHpFuWvnMcAdyIdsdn3y8nQpx1rOMLV44YnEoJlJ +xG6Y3CNZmg0dt6/J+Ok7LApnQSeTaaqUFNA7oayP8P/Ai8NiZyiTbmxEs6kMtVxZh2E IHnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841336; 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=FnARXeUlH8SP3sL9hF5FqRg/oldYCWKd88vCzYsrVf8=; b=MGVyMwpDNjq1L1uwJ1pd8NLTffGNjIowDpXrv94cCIsMYb6QuV8sE9cKDl/KFAKyLk GGPCfXT0USkuGAv3ARmILTVKqN21AFwrM0a3X/IgJrX7Bdx7G+d0VkXAMeAg9CfWr6Nz 5Pgz4Qnjj7SR2QNna+jcZ7REpitt8PngzvMaJqxgr5vL1f9nUrl9zcemtDBcD/3xHcD0 ODYvtRO2FGPSILYvmp+zJbUGVZ93+MV2XnYxuPZu/6i8d+jtyK0K0oD91BLxkPHOEhdD tcXLAlSSdsbZi68f/ZrAASzcs2WStXMS7Gv+vEPpCj91FcyxZkDNN7Qbm8BKoeBr1EAm NLlg== X-Gm-Message-State: AO0yUKUhCf5KkumGFOTZV39gvgZjzcX48/wi/r2cGn4oS6cJgDOVIjA7 S9SmNeEVqFPD6MrCTz3dmNo= X-Received: by 2002:a17:906:105e:b0:89a:8238:3323 with SMTP id j30-20020a170906105e00b0089a82383323mr6295288ejj.6.1676841336315; Sun, 19 Feb 2023 13:15:36 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id s12-20020a1709066c8c00b008d325e167f3sm330408ejr.201.2023.02.19.13.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:15:35 -0800 (PST) Date: Sun, 19 Feb 2023 22:15:33 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] staging: rtl8192e: Remove entry .get_eeprom_size from struct rtl819x_ops Message-ID: <1323e1ae2b4f52dc42b7ce5debca5608c9c5aafd.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758295876601000239?= X-GMAIL-MSGID: =?utf-8?q?1758295876601000239?= Remove entry .get_eeprom_size and replace it with function name rtl92e_get_eeprom_size. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 104b16cfa979..73f3d0973a5a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -27,7 +27,6 @@ static char *ifname = "wlan%d"; static const struct rtl819x_ops rtl819xp_ops = { .nic_type = NIC_8192E, - .get_eeprom_size = rtl92e_get_eeprom_size, .init_adapter_variable = rtl92e_init_variables, .initialize_adapter = rtl92e_start_adapter, .link_change = rtl92e_link_change, @@ -974,7 +973,7 @@ static short _rtl92e_init(struct net_device *dev) _rtl92e_init_priv_variable(dev); _rtl92e_init_priv_lock(priv); _rtl92e_init_priv_task(dev); - priv->ops->get_eeprom_size(dev); + rtl92e_get_eeprom_size(dev); priv->ops->init_adapter_variable(dev); _rtl92e_get_channel_map(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index fd96eef90c7f..00e413a644d2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -205,7 +205,6 @@ struct rtl8192_tx_ring { struct rtl819x_ops { enum nic_t nic_type; - void (*get_eeprom_size)(struct net_device *dev); void (*init_adapter_variable)(struct net_device *dev); void (*init_before_adapter_start)(struct net_device *dev); bool (*initialize_adapter)(struct net_device *dev); From patchwork Sun Feb 19 21:15:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1005938wrn; Sun, 19 Feb 2023 13:20:23 -0800 (PST) X-Google-Smtp-Source: AK7set9NbFPTWbatpV4MR/hkUWqAt8JI93I9c1RpRCKKiS2XkNKJBmTkWsEyMf3kIsoYL94QmlX8 X-Received: by 2002:a05:6402:164c:b0:4ad:7c30:25a3 with SMTP id s12-20020a056402164c00b004ad7c3025a3mr411798edx.1.1676841623125; Sun, 19 Feb 2023 13:20:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841623; cv=none; d=google.com; s=arc-20160816; b=jt7YL9hfDOJnKVXql3xSX700pas4EXHD4BPe5gJW6TGcDmtKFoSNfbGsb05Ol/s6hU F3psapme1+EM/jXevKmd3j0/5G34sckDcKYdN4tzOINGLtKWrfwbu28EgvH2FbtLBhTn nRu9FwN/RORDy7dIyInbJEZUUk3KYRLzvNElC49IeEfwGjtPnx1IZ/LtH8/SDyF8gSCA gnYwAwdrpZVI+xI3t+pZvfNADfG6segEU4fNfRUOAyZrD9rhLbubBWrG/7MxGLWi1Gvh FpZmbB/IljOPnXva5KF5AtFszLaRLilPpg4HPzHiNBQyVE4vgvoAtDkdT8Bm1hQWGRLE n8xg== 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=CNKm2ICS8NTcE9li8wqc3yPoX8R5OlDOV+QO9nDi+Rk=; b=KBukoR6UwQlnfQed/yMLgfJcXv53VkOZvuMKsx2Hc6QkELl5Agvdox0mmNvW38wpv8 UNWY17wixcPn5axmGJcGscMkgQew73e5vHukX2aoF0gZZs6zJiHAfHx+zhz8mL0OvPP8 dTimpuBzpDLOEPnIshnfecxd5nmXOXA0E0+yR06vDnrkmh4/YIwsq65oVXNdSlOTbFq2 5NHuuxUdqz8gD/CEXXOhNcm9DpxtEBEzz/yXv1X2v8k0JZMjrmwZp+yRNPcqJQL960Xv bgyHyoSooMYSKN6ZYjUiLtr3iijeXShCdeplf5licg3/cpOkECzGwbJ3gvK2PZCYbub5 s6ZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=T6l0u7h2; 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 q9-20020aa7d449000000b004ad7c1ef7c7si10268955edr.506.2023.02.19.13.19.59; Sun, 19 Feb 2023 13:20:23 -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=T6l0u7h2; 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 S231645AbjBSVPu (ORCPT + 99 others); Sun, 19 Feb 2023 16:15:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231652AbjBSVPs (ORCPT ); Sun, 19 Feb 2023 16:15:48 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FAD519F06 for ; Sun, 19 Feb 2023 13:15:44 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id ec23so4563618edb.1 for ; Sun, 19 Feb 2023 13:15:44 -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=CNKm2ICS8NTcE9li8wqc3yPoX8R5OlDOV+QO9nDi+Rk=; b=T6l0u7h2r5bDEzKhCuMOX5vwH8APMxKVNNOiSC/e8tLHeKNSHx1VgVQueGNayOrp6R v5FBLKlOsx+jxt2IQJRc9Ke/iaH1NyYES+uT2D/jugsWPOZEZNDt88eHDtgUuWOUReup rQRj1x+Zi7tcrlLFIxtRA3GCc8tkEtQQUFmV+9kHZRPkOvq9i+ccHWKhaSQEY/dBG5xp PTA6pdh4tp9sxrZm5+WRsPQwTzqRiWLgKmQfnmnnJZfW8llj4Eume4G6IcL/uxf5jggw 3YT4pW78YA9RdZbvzJKTqV3vRPVE+Ewc5uT+SKvEAoY3QqOLuZKA4L/jSuy/dY8pgTZO Dc3A== 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=CNKm2ICS8NTcE9li8wqc3yPoX8R5OlDOV+QO9nDi+Rk=; b=VC5pDk10F2afMEi87XFa2BWqk2LmjR7cMJYMEr0LPmlpe9FQ+Y5EKWGqiZ3+10uNtl sl8uR7gZtO6MVs/1067RMUTt95udWZQXRGI33JypgqGKCgn7O1zdIjxd+mDi0o05C7xh PFvyMw5ZGhOEw1w6vogamH5GlX6RM63p3KxC0y+O7y/LhQMS7uxQgGRFRVvE+vBuyRwI mX4ej1JV02iH9UtTjc3xUKFwXJFkfqAG+srd2vnxJLMMcp6wVTipxZ20njuLtwbIgfUc JXTd+5fcc+TRSRWxRsiL6/XoQnm8KGZOvvRTPY7stX5DiDUfWlj6oh5npdJZYBWIjz6/ Iu0w== X-Gm-Message-State: AO0yUKV5mZzZACtzT9wd6wxUoddrHLievvliEhR+meE7zI7EwW50e9G7 94EwHSKRxxtBF06k7ZszYSQ= X-Received: by 2002:a05:6402:d0e:b0:4ac:ce7d:a9c7 with SMTP id eb14-20020a0564020d0e00b004acce7da9c7mr1056616edb.4.1676841342625; Sun, 19 Feb 2023 13:15:42 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id o1-20020a50c281000000b004aef4f3bc26sm925604edf.87.2023.02.19.13.15.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:15:41 -0800 (PST) Date: Sun, 19 Feb 2023 22:15:40 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] staging: rtl8192e: Remove entry .init_adapter_.. 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?1758295881909104211?= X-GMAIL-MSGID: =?utf-8?q?1758295881909104211?= Remove entry .init_adapter_variable and replace it with function name rtl92e_init_variables. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 73f3d0973a5a..7b8683a9bdb1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -27,7 +27,6 @@ static char *ifname = "wlan%d"; static const struct rtl819x_ops rtl819xp_ops = { .nic_type = NIC_8192E, - .init_adapter_variable = rtl92e_init_variables, .initialize_adapter = rtl92e_start_adapter, .link_change = rtl92e_link_change, .tx_fill_descriptor = rtl92e_fill_tx_desc, @@ -974,7 +973,7 @@ static short _rtl92e_init(struct net_device *dev) _rtl92e_init_priv_lock(priv); _rtl92e_init_priv_task(dev); rtl92e_get_eeprom_size(dev); - priv->ops->init_adapter_variable(dev); + rtl92e_init_variables(dev); _rtl92e_get_channel_map(dev); rtl92e_dm_init(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 00e413a644d2..541b7aa366a5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -205,7 +205,6 @@ struct rtl8192_tx_ring { struct rtl819x_ops { enum nic_t nic_type; - void (*init_adapter_variable)(struct net_device *dev); void (*init_before_adapter_start)(struct net_device *dev); bool (*initialize_adapter)(struct net_device *dev); void (*link_change)(struct net_device *dev); From patchwork Sun Feb 19 21:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1005978wrn; Sun, 19 Feb 2023 13:20:31 -0800 (PST) X-Google-Smtp-Source: AK7set8o572htna2TZjYeOJwLw+zRkpI6vmkdfQlFgBz5KuHrCRHDoPOPnyAxjObpP+nesxWthgn X-Received: by 2002:a17:906:e254:b0:883:3299:91c8 with SMTP id gq20-20020a170906e25400b00883329991c8mr6613425ejb.55.1676841631371; Sun, 19 Feb 2023 13:20:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841631; cv=none; d=google.com; s=arc-20160816; b=hAJv0B0X/EKZulzYtwYOkbhYIHkNR7kFsvLqpgmBhJ8zB5LThJORxo/fAXrCObhv3s FVRFehxDcWDa66LGakw8E0JyuYkdK8VN1eLOeIE92uM1iQNOjzOHI8Teu1pJTZ7n7sJ+ GiC/6OGrbz0TLhvJyVmq7lPjDcWoNLk8wK9/bkDoFgl9m7IBUySeuVdfMW5WTTvOdmxp mmHq0TWTQF0xXY+q4iTWPnoFhSed4iNTl4yVfdxmYoN+Gr+F7IS/K3rPgFWR+N+3TIF3 KRCMIN6D/26EU2e5l29FwbJNpV4bdyNdHjGTfsbWgAtD80EPCmYfgmCMI6J82Ui6ohQ5 OYQQ== 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=SkbsuJIz6VwsIVSfK2JskzxbP3ShTN1QUSOlCSaSNH0=; b=M6nmPgZ27V/9Bmk9FbprZUXYPR3WZpGz6FI8oH3EwRXYdDOD3OiVvm0EK1p09XRAri C+FYr1EAkyIoEF4IRcT4U7Kj8LQx6VShamXijVl4PeYrbprTVew3iJbhWBtYnEp4lig1 YkF+yTXy6DoUNj0lVKTFnZ+wuVJ2UBxFWGmBUFhqRVWBMHS4kYQQHzEzgR5fuRfG5y/Z lox7t4YZeXSuAcqodRQ2A5X/qtzlPhJduWBCKwM8mIfGAEkHA3Ps++hmmPl1zfCmmhi3 UdR/M/fZiK3jgRqKRN04BEkfXq5KhvFAo8b+xi/YCxroc7bu0XpyxzTzMOZNdCEHwKrn h9Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XOtDzQAq; 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 p22-20020a170907911600b008caedbfc3acsi3508773ejq.419.2023.02.19.13.20.08; Sun, 19 Feb 2023 13:20:31 -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=XOtDzQAq; 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 S231654AbjBSVP7 (ORCPT + 99 others); Sun, 19 Feb 2023 16:15:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231652AbjBSVP6 (ORCPT ); Sun, 19 Feb 2023 16:15:58 -0500 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ECA0196AB for ; Sun, 19 Feb 2023 13:15:50 -0800 (PST) Received: by mail-ed1-x530.google.com with SMTP id eg19so5691730edb.0 for ; Sun, 19 Feb 2023 13:15:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841349; 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=SkbsuJIz6VwsIVSfK2JskzxbP3ShTN1QUSOlCSaSNH0=; b=XOtDzQAq3ERBqYgJBscibnLrqjW93b4cRvR2aRUdzauL+vCexicJb0FcjUWsii4kDu g13QeT1J1aZvoA74xIZpIHXCWedKRb6fujCCQOsdPKYxN8qYir1Lrj6/rnfAVQlb2Xor aXAryvA+8Ei16j8NaQwiPR2JbuUu/hzDw3AIJqUG32E5ZkZCcyKYSopHWShMjg7x+Ea9 Gv/9j7Yclol1nDWtW0cZHC7yj/TzyKCLpL8djkDUTn+Odcugc2ZMQZODiYwYyFcwO4lD 7Q07ECXJe66qkrfc21PMQBoKcWA9FGr9R1UYGj7B1LQIpy2G/omF9Fjal57VdrgqrEqH iMJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841349; 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=SkbsuJIz6VwsIVSfK2JskzxbP3ShTN1QUSOlCSaSNH0=; b=Jn4853byPgEqJmXIjgOnouCdvSq/roLfcONV3Mc1m66F5v8gkKPIsRh8kub+HnslPa i+S+WAzULugIoHg10nS4zv4sK57P0uX457Cij0E9JQGJoPTdAtNcRbYP7GPA5iy0YaHZ pt2S3s8d79eWCCzc4kebUhPSBVLTgcY4r8jtVVwrelRE2h+NtukmwZej14xTDhSlXWQp l7d2fhvBSfhjEueN+BrJCVxpKHa5DW8POAOr9aYRQYjTyfvNQeQycZ1v56wZV0K9dh8p sYWYv6kbfNTVGdIRFQYMgaLhc3cd32OlMa4Ih4pUpJHaQjlcxLNfbKtNQM11Z+rYj9y4 OQxQ== X-Gm-Message-State: AO0yUKVyfY/H3P1rYLBuDVjItlgalo+VUiuR3qmjRy+SJyZmcen4GjxW HY8Y9abdAJahqpz85QgQ4IqmcgqE7o0= X-Received: by 2002:a17:906:256:b0:882:bffc:f2d2 with SMTP id 22-20020a170906025600b00882bffcf2d2mr7958249ejl.2.1676841349029; Sun, 19 Feb 2023 13:15:49 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id u21-20020a17090657d500b007c11e5ac250sm4853849ejr.91.2023.02.19.13.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:15:47 -0800 (PST) Date: Sun, 19 Feb 2023 22:15:46 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] staging: rtl8192e: Remove entry .initialize_ad.. from struct rtl819x_ops Message-ID: <7457e18ea9f3b2415bf41fca8ac2b22349d2edd1.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758295890817921835?= X-GMAIL-MSGID: =?utf-8?q?1758295890817921835?= Remove entry .initialize_adapter and replace it with function name rtl92e_start_adapter. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 7b8683a9bdb1..3bebc1153572 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -27,7 +27,6 @@ static char *ifname = "wlan%d"; static const struct rtl819x_ops rtl819xp_ops = { .nic_type = NIC_8192E, - .initialize_adapter = rtl92e_start_adapter, .link_change = rtl92e_link_change, .tx_fill_descriptor = rtl92e_fill_tx_desc, .tx_fill_cmd_descriptor = rtl92e_fill_tx_cmd_desc, @@ -690,7 +689,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset) priv->rtllib->ieee_up = 1; priv->up_first_time = 0; - init_status = priv->ops->initialize_adapter(dev); + init_status = rtl92e_start_adapter(dev); if (!init_status) { netdev_err(dev, "%s(): Initialization failed!\n", __func__); return -1; @@ -2381,7 +2380,7 @@ bool rtl92e_enable_nic(struct net_device *dev) return false; } - init_status = priv->ops->initialize_adapter(dev); + init_status = rtl92e_start_adapter(dev); if (!init_status) { netdev_warn(dev, "%s(): Initialization failed!\n", __func__); priv->bdisable_nic = false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 541b7aa366a5..9edadc62faa9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -206,7 +206,6 @@ struct rtl8192_tx_ring { struct rtl819x_ops { enum nic_t nic_type; void (*init_before_adapter_start)(struct net_device *dev); - bool (*initialize_adapter)(struct net_device *dev); void (*link_change)(struct net_device *dev); void (*tx_fill_descriptor)(struct net_device *dev, struct tx_desc *tx_desc, From patchwork Sun Feb 19 21:15:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006035wrn; Sun, 19 Feb 2023 13:20:43 -0800 (PST) X-Google-Smtp-Source: AK7set8jVvyr4Id0GsH4xIOlUWb0e8JkhZXS93sFTCqSxXHYCWFKf83pm337jPICvugG7Pg+zApM X-Received: by 2002:a17:906:2611:b0:87b:d62c:d87 with SMTP id h17-20020a170906261100b0087bd62c0d87mr6426244ejc.1.1676841643756; Sun, 19 Feb 2023 13:20:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841643; cv=none; d=google.com; s=arc-20160816; b=Qmgrku6/UwYPOwdzJ+xDq6yn5xYv521FkeSv3VY717eOHx109wQcCVpJW3KlmWA4mS aO5axmXActCJGXW6OWhYK738XzvMNO3tXVAMGk8KbPLfwyvbu87GXEkgPJD0PsrJysq8 eC3p/0BcAVe3EJh2KjjalMvqEl/23SSeaRNYNUHSNfGJyjQQbquIHL1Qr/C6f+UCOTEB rixfWzKUQHV5o68ajXAQS8vOKtTjOb1ZuwSRD9L99g73yjfXCyj8JwhHX9tSrkn1HpHp wIS500eeH3TtUUEZimGl+O8ko7kNmlsHn4NfD6IHLPK5ZTpT7kR3aA7ZTtKw57sNxmIj /x+Q== 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=KjjWJfxbsqn6gyfLTHs1w3kGrQ+J6hwOQ7AqbciTCCg=; b=h8KuTEko5zU7pfonROCflKs+vLQueDVK6KUAZK+pXNJm65R10fIgfrEDm1Nd2Th7HM qTfNSGVDoo44IkUV5ewlEIxroQ1j6pV2SZUEcu+BMZOWoNwoKZNciJTFDaJYB0do0lpV eIU699qIZE/bTsRiSZRHaG59EYJx/fKkFVz67Ka4zDcLhQSVWFMjcsr570eHhgsEb7Mc ZLHC6pXuifZKmjtb49GZ9JB5yeGrLNNmSQmdfSHvgJYBKJ7b6t95fj2Jm6xwOKaU8JCD RFz2M9rXC7Ueh7voHiUIeBylHQ/FTWbXw+8zqMUnJzt3/epa/KzmH6kK8WUUiaCp3w2E 6h6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="XyNxU/u1"; 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 uo19-20020a170907cc1300b008b17a1f0979si9704179ejc.319.2023.02.19.13.20.20; Sun, 19 Feb 2023 13:20:43 -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="XyNxU/u1"; 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 S231668AbjBSVQM (ORCPT + 99 others); Sun, 19 Feb 2023 16:16:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231670AbjBSVQJ (ORCPT ); Sun, 19 Feb 2023 16:16:09 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0433199E0 for ; Sun, 19 Feb 2023 13:15:56 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id fd2so4399351edb.8 for ; Sun, 19 Feb 2023 13:15:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841355; 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=KjjWJfxbsqn6gyfLTHs1w3kGrQ+J6hwOQ7AqbciTCCg=; b=XyNxU/u1C28TR7N2u8CLt4P3JlztWLoYHs2eQZG2zcwlNAfYebV+Sw7ji8BxliZ/Xj yB9ZsktPVh/pR3BMXxDjuBmz3BlMClDdiPfW3eMLZlQyoKXMTQWbfyj4KPbWSZw7vnrt T/FXvyuT4meqWUnPJapFvOWTtFvrGlu2iUHLW+TSlqPnmvOf3S0nQy5+69cyFqF8w6Us nMPOpdMWT8UxZEqtT0gKOt1L5O0TBpFwgd14kF+a8nrxDhHZ7aFK7AveH/DEgQ/TK0k+ 2rWSaQyYfGgL78qA+e52VkZ4d77fi1qELdO6RX0Vuz3ir4EOv+z7wTkw025EqYgeFVVV IvPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841355; 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=KjjWJfxbsqn6gyfLTHs1w3kGrQ+J6hwOQ7AqbciTCCg=; b=z/DOIkfX6L2jp04k9HMutTC1klo1AU8ohFgPvf8k6BHxnO84WvzghuVd86+rOPfwNI QuzEnQKtYks2eh9jS6KDSEM9WZdAnKyiZpkpVF2JvTd8CzIt1WDbK5k32XPWWaCwFNez yryi4TkXQ4gYXCNWVKTA7C5CZrkBq7rFPjb9Kh+9++UyWvHmOWg/GfDZmUNzZ4d9NpLR kPmOAzQpecEO3xKvw5VsQ+pgoOusHwwpICTPnGhn7lIgVegWTiVbzjQXakwnsr1d0tKo awb2Jc9J/P8z9QBH4e263REQ4o8V8iC1/WA6VxD58017JO/frXy6Gg6MUqixNjtJ8a4G X8/g== X-Gm-Message-State: AO0yUKVapfjRmTZHZ2CGaJm5n04Pa36//hiIM929MxyPyjUyB/wZoOqM w0+9sF7MRUOmyJhCtSBzetg= X-Received: by 2002:a17:906:51d8:b0:8ae:cd8e:3957 with SMTP id v24-20020a17090651d800b008aecd8e3957mr5745457ejk.4.1676841355330; Sun, 19 Feb 2023 13:15:55 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id o23-20020a17090637d700b008c5075f5331sm1801552ejc.165.2023.02.19.13.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:15:54 -0800 (PST) Date: Sun, 19 Feb 2023 22:15:52 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] staging: rtl8192e: Remove entry .tx_fill_descr.. from struct rtl819x_ops Message-ID: <1ae7d44ef74dc6cb61ff43f670b21d702403d7fb.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758295903263190344?= X-GMAIL-MSGID: =?utf-8?q?1758295903263190344?= Remove entry .tx_fill_descriptor and replace it with function name rtl92e_fill_tx_desc. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 3bebc1153572..dd1f4a3c4bf9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -28,7 +28,6 @@ static char *ifname = "wlan%d"; static const struct rtl819x_ops rtl819xp_ops = { .nic_type = NIC_8192E, .link_change = rtl92e_link_change, - .tx_fill_descriptor = rtl92e_fill_tx_desc, .tx_fill_cmd_descriptor = rtl92e_fill_tx_cmd_desc, .rx_query_status_descriptor = rtl92e_get_rx_stats, .rx_command_packet_handler = NULL, @@ -496,7 +495,7 @@ static void _rtl92e_prepare_beacon(struct tasklet_struct *t) skb_push(pnewskb, priv->rtllib->tx_headroom); pdesc = &ring->desc[0]; - priv->ops->tx_fill_descriptor(dev, pdesc, tcb_desc, pnewskb); + rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, pnewskb); __skb_queue_tail(&ring->queue, pnewskb); pdesc->OWN = 1; } @@ -1637,7 +1636,7 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) if (priv->rtllib->LedControlHandler) priv->rtllib->LedControlHandler(dev, LED_CTL_TX); } - priv->ops->tx_fill_descriptor(dev, pdesc, tcb_desc, skb); + rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, skb); __skb_queue_tail(&ring->queue, skb); pdesc->OWN = 1; spin_unlock_irqrestore(&priv->irq_th_lock, flags); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 9edadc62faa9..0d4ae3a310da 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -207,10 +207,6 @@ struct rtl819x_ops { enum nic_t nic_type; void (*init_before_adapter_start)(struct net_device *dev); void (*link_change)(struct net_device *dev); - void (*tx_fill_descriptor)(struct net_device *dev, - struct tx_desc *tx_desc, - struct cb_desc *cb_desc, - struct sk_buff *skb); void (*tx_fill_cmd_descriptor)(struct net_device *dev, struct tx_desc_cmd *entry, struct cb_desc *cb_desc, From patchwork Sun Feb 19 21:16:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006119wrn; Sun, 19 Feb 2023 13:21:07 -0800 (PST) X-Google-Smtp-Source: AK7set8lwo7pGK/lDFj3JQxmiizSyFS3fGSV/Wrn/yMkxUM2xM0Nwmcv9A+ZYoj9UPnUnSFIH9Kn X-Received: by 2002:aa7:d7d4:0:b0:4aa:cc30:b858 with SMTP id e20-20020aa7d7d4000000b004aacc30b858mr502486eds.7.1676841667007; Sun, 19 Feb 2023 13:21:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841666; cv=none; d=google.com; s=arc-20160816; b=pwA9xXpeDatE63aSYnou0XYerQWGJ7NXUGUU6aKce1UFnCs/XntmIuj2eeUSQbjRJU Qp5hU6j/85+dtvpyjltGAHDoEwR1CtxVWJPqWoy16tNc2whWPoKoM3TlrHzRihbKpdbz Q/DW1on2dpfZwwCOfBJWpQItz2pHzs3aoPWMei5kC7mvjkotIYrAItHPceL2MwNGuIoh d4/QpFKSZeVpIemEz9C5cxoU2Oz+5VrICJw9t86sswhahzpgFWRjfQNe0jT3SgHZV6QH mX5NTTHVc2a8O5MmD45eCXS4J/x0yynwMpzGQbiM0LEFlgmdMNs3Hku8Bj3/FyJZFwWP ib2Q== 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=zBGT80p9I2eT4hT6fNa+sJ1+FO2kjG3R8giy+glmW6A=; b=0dEoTbzFnGpYpFPu5lIth/3I3zYIMgcFiG3biY2ByQ1qJU0xcOE8v2c1PofyHAPYHC PuVqY1MAP8MftGDSDbtrLZTA28gRwrDlfzBxRKEtyumey62KnL6PUQFLwc5hi/jy5Ls2 QszMP2bOCS7FohyOarV82Od0LPujyAEbUMcHS3Oh2+SngCq2vdsWGJbpqk2oBHGur4fu gePA9qe4V4U0qwyX4628a7A2fCXxDdFBFjwEeZUu8O7IXChch1O+ayiTfRusjEuS9cr3 UU+Z0u6Ff/qJ+r7/tOzBL/ziVDBzFhSwBOuLpegjkNTTvrV8il33Qo7PgFHvpihyW0In wy9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eNMpxHaB; 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 u15-20020aa7d0cf000000b004ace62d6eb0si13203232edo.528.2023.02.19.13.20.44; Sun, 19 Feb 2023 13:21:06 -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=eNMpxHaB; 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 S231673AbjBSVQW (ORCPT + 99 others); Sun, 19 Feb 2023 16:16:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231672AbjBSVQV (ORCPT ); Sun, 19 Feb 2023 16:16:21 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25CD119F08 for ; Sun, 19 Feb 2023 13:16:04 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id en26so4249301edb.13 for ; Sun, 19 Feb 2023 13:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841362; 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=zBGT80p9I2eT4hT6fNa+sJ1+FO2kjG3R8giy+glmW6A=; b=eNMpxHaBvi2z3V+dJ7Gh7RQCO8pVc1sugU2YuoqgLTYHkj3Ph68rM7Jq7QCobCvbqg BZ0OVochzeMUhlAqncS0gGGVnVoDO3BNwwmPoF+lX/UkhUwvj5CpmYNruMYcibt4e+r9 o7c48X4OKjyKMdjVRYykgV9Gx27lsT8OZQKAqO+Civ2IKA0ojmG8gqQiS8K4qdct7l05 5EFu4NE/zAGpx5N4+Q14lBZB1MGiLN5HbrDRArDFo+znaihYeDAk8nNSymRHV9p+kWny 6gk5FYUMo054MSCpypzLEu6WNnNdXCJfSZ6LGt1QXuHIlbP9gbjvU0WvdHsFgvLWHRF/ f3XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841362; 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=zBGT80p9I2eT4hT6fNa+sJ1+FO2kjG3R8giy+glmW6A=; b=E53ZQBFNIpcLdn4i/GgpwNgMStp9ByHzOgZ5ItewklEZFXtVVO+2U97QiNWsoixDDY 9cFo/NXk0Tc1VEr9wefrutO0bR3gEZxMNRatfzGfUSUB62n32aaHbkPxmXGf3yYqiJOH OaNgeCKXGYngC8wy/3IilOKN6lnPerZ+agq01AR5vkqxH+XV96W36PkWajphrIiRsJR1 jBUnSEbV261NuOyV72eXKlhLmaPHux63lLPJr4i7XkOtfgmV9GY1KoY+IGvcaSqU1GY4 qB8rUzE0tq87ylXI1vYnqyvlbP6bcrhVE81qAszEQ6fEJuqCueH0tTo7Eb1jAoUCZNne xdTg== X-Gm-Message-State: AO0yUKVE+cMBYU7srUR/LWGp59tUcx9SieTbLL60Cf7V6yoXm6xcMm1r J4mEhnUL2LzX/AdfOBwg5yg= X-Received: by 2002:a17:906:73d2:b0:87c:c1:111 with SMTP id n18-20020a17090673d200b0087c00c10111mr5266553ejl.4.1676841362681; Sun, 19 Feb 2023 13:16:02 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id k26-20020a170906579a00b008b2714f4d8asm3551162ejq.181.2023.02.19.13.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:16:01 -0800 (PST) Date: Sun, 19 Feb 2023 22:16:00 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] staging: rtl8192e: Remove entry .tx_fill_cmd_d.. from struct rtl819x_ops Message-ID: <713a48fcd6d56c3cc4e32aea0eeba881e0d092c5.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758295927375150476?= X-GMAIL-MSGID: =?utf-8?q?1758295927375150476?= Remove entry .tx_fill_cmd_descriptor and replace it with function name rtl92e_fill_tx_cmd_desc. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index dd1f4a3c4bf9..372bb4810c31 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -28,7 +28,6 @@ static char *ifname = "wlan%d"; static const struct rtl819x_ops rtl819xp_ops = { .nic_type = NIC_8192E, .link_change = rtl92e_link_change, - .tx_fill_cmd_descriptor = rtl92e_fill_tx_cmd_desc, .rx_query_status_descriptor = rtl92e_get_rx_stats, .rx_command_packet_handler = NULL, .stop_adapter = rtl92e_stop_adapter, @@ -1577,7 +1576,7 @@ static void _rtl92e_tx_cmd(struct net_device *dev, struct sk_buff *skb) tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE); - priv->ops->tx_fill_cmd_descriptor(dev, entry, tcb_desc, skb); + rtl92e_fill_tx_cmd_desc(dev, entry, tcb_desc, skb); __skb_queue_tail(&ring->queue, skb); spin_unlock_irqrestore(&priv->irq_th_lock, flags); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 0d4ae3a310da..5af14837df31 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -207,10 +207,6 @@ struct rtl819x_ops { enum nic_t nic_type; void (*init_before_adapter_start)(struct net_device *dev); void (*link_change)(struct net_device *dev); - void (*tx_fill_cmd_descriptor)(struct net_device *dev, - struct tx_desc_cmd *entry, - struct cb_desc *cb_desc, - struct sk_buff *skb); bool (*rx_query_status_descriptor)(struct net_device *dev, struct rtllib_rx_stats *stats, struct rx_desc *pdesc, From patchwork Sun Feb 19 21:16:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006360wrn; Sun, 19 Feb 2023 13:22:05 -0800 (PST) X-Google-Smtp-Source: AK7set/q7CaeRVhEvpMzKvsDRPy05p3BrRPdBrOSvl4OWYkg6myvGJXWPNWdxiUQAJ4TJrhPAo+W X-Received: by 2002:a05:6402:134e:b0:4ac:be56:4fd4 with SMTP id y14-20020a056402134e00b004acbe564fd4mr2463046edw.11.1676841724950; Sun, 19 Feb 2023 13:22:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841724; cv=none; d=google.com; s=arc-20160816; b=xK7gtLnr3erDXreIbwTtYYuAqbSAMfn3XlGXOlpUMNiyjg0hAOeps17jFghY6dY8b5 M4iy3SPS+7yeWLoee9dtKojdy87c3klYrtVj1NGOsWUSwAwiOSb+UqpnR9fkyPOQpsSA GHhWHbD/a5QqZlVng1ffgIWgpqBgXDNCatvTpDyUUUa6cwec6ZA/4emMxcv/HalKwasF NLEGPh7abXSKukWyJeuSrsXohtbtunUZZ/o2jj+Xc9bNL+ViMEpki8GJ2v4OwxarA8SL HWpSgqpmV5iWttx1P1204ox8h6173TTDxYIjtmaqZhdd5zzSYtCA2bl6q8yVG5XfbGf+ 9ZqQ== 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=pVhtpko5aJjNQpaFyeGt6sBZfnruBHfevG3pGWCXzvQ=; b=iD5AERr0XSdhIy7aN/z0Rs6ow2R+u4FTSprjO1/jb4GoX5ttt21fMG/ZwSr+lt2Tpu /3GHM4LEX2kVHarn90APzw/SG6J1RJhfsIZO9rhzaEFVFzfoWQ+EfvIaIJ1bjtG6yJMr MXv5acGcUY59oUuDoC/Eb6tJl3TqrhsB+bWdXvDk8eg86WVyw7Az76xamrZsMFOXv7t2 Nd+9ONpgeNS4g8gogcF26HVURXREKR1Tr8SVmZW7nIZPQngYckk7UzKFPGqjGPcFeTo7 QNX2YcfsQYitdbjr1iJRLHEhcvVHwMUngaNyAGlrLUnqhcPiENn3gu3dFa+WlRq2ggrL SEWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=E0+1lh9f; 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 l23-20020a056402029700b004aef496ea73si5819243edv.126.2023.02.19.13.21.41; Sun, 19 Feb 2023 13:22:04 -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=E0+1lh9f; 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 S231334AbjBSVQl (ORCPT + 99 others); Sun, 19 Feb 2023 16:16:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231265AbjBSVQj (ORCPT ); Sun, 19 Feb 2023 16:16:39 -0500 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE95D19F31 for ; Sun, 19 Feb 2023 13:16:16 -0800 (PST) Received: by mail-ed1-x535.google.com with SMTP id dk16so4408818edb.6 for ; Sun, 19 Feb 2023 13:16:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841374; 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=pVhtpko5aJjNQpaFyeGt6sBZfnruBHfevG3pGWCXzvQ=; b=E0+1lh9fgR63sYkEUG12n82xztyEF2mIUB2VCsYRfqSmQ9rwFhoLCgG2RuIRO/aKJu UomG4HMkNGZ7U9b+lItckEorsmT/JTswquBS7dYfyaBSDi7P4CO1zhP2x2jpaup9P8/N y8VXYF2gdn51GjPBhp4+ZHaSHFtS5X/5mJKktJzmnTtupOBg4+ihV+cqRtpoXQJYKj6F h+ZU6igApAyTbpgA9P2aSjV/MOdf+LyUASWpJbrLS5flN8kf2HggnIn/jcDDCTg1fSb0 vKagVFl9Vy9KnIPr3qxfktxk7dAQEuC+FNBMFZJT9mJIJmHowFPoz7ItmKAzNX0hblQt +5GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841374; 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=pVhtpko5aJjNQpaFyeGt6sBZfnruBHfevG3pGWCXzvQ=; b=Xna74gSTXKsUxX4QpqW2xHTZHTaYHer305ugdrgBBnXY5K3vSC6N9++6Itentd7EIc ZQh5og17YFPwbZtT4iNGYqtqs3gZZP5L+gxa5AmjwxEJ/3ovUPK6qqwYpFtxu7b7V+F/ YSAQ3wfUf0tLG3rDGYA7MA0NixUiezbIRdByy9ZtzIL7Jp93IvpzBm2g7ZN41g41cctv pYtTBkM0Dg48JUmF0+6zDJiIB0caausEE9kltsw76wCM2h++ZROP870s05Nzu9AM1/SD zwNSlk/fio+4v85TPKOLL/O25RtBqGgqInGAy0fSYStD0mE0TwsSjQSCAhqk/e2DZgTh cYrA== X-Gm-Message-State: AO0yUKX5qteGzlSPnj+Itrapo7tkpI6KcJqtNwRzwTLLwH4HJI6ErxpQ I1BHE0gP9jwYoE+Y8GZdChBJothby+A= X-Received: by 2002:a05:6402:34d5:b0:4ac:8e63:300a with SMTP id w21-20020a05640234d500b004ac8e63300amr1360747edc.3.1676841374662; Sun, 19 Feb 2023 13:16:14 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id g17-20020aa7c591000000b004acc1374849sm392354edq.82.2023.02.19.13.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:16:14 -0800 (PST) Date: Sun, 19 Feb 2023 22:16:12 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] staging: rtl8192e: Remove entry .rx_query_stat.. from struct rtl819x_ops Message-ID: <889c557f6e312645eb40173b7ffa210cabf10110.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758295988842018525?= X-GMAIL-MSGID: =?utf-8?q?1758295988842018525?= Remove entry .rx_query_status_descriptor and replace it with function name rtl92e_get_rx_stats. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 +--- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 372bb4810c31..a4796330f86d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -28,7 +28,6 @@ static char *ifname = "wlan%d"; static const struct rtl819x_ops rtl819xp_ops = { .nic_type = NIC_8192E, .link_change = rtl92e_link_change, - .rx_query_status_descriptor = rtl92e_get_rx_stats, .rx_command_packet_handler = NULL, .stop_adapter = rtl92e_stop_adapter, .update_ratr_table = rtl92e_update_ratr_table, @@ -1885,8 +1884,7 @@ static void _rtl92e_rx_normal(struct net_device *dev) if (pdesc->OWN) return; - if (!priv->ops->rx_query_status_descriptor(dev, &stats, - pdesc, skb)) + if (!rtl92e_get_rx_stats(dev, &stats, pdesc, skb)) goto done; new_skb = dev_alloc_skb(priv->rxbuffersize); /* if allocation of new skb failed - drop current packet diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 5af14837df31..d83af5f8ce82 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -207,10 +207,6 @@ struct rtl819x_ops { enum nic_t nic_type; void (*init_before_adapter_start)(struct net_device *dev); void (*link_change)(struct net_device *dev); - bool (*rx_query_status_descriptor)(struct net_device *dev, - struct rtllib_rx_stats *stats, - struct rx_desc *pdesc, - struct sk_buff *skb); bool (*rx_command_packet_handler)(struct net_device *dev, struct sk_buff *skb, struct rx_desc *pdesc); From patchwork Sun Feb 19 21:16:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59214 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006418wrn; Sun, 19 Feb 2023 13:22:16 -0800 (PST) X-Google-Smtp-Source: AK7set8RcwbzPCBt8LhyDuzKwo55xknRLMY3martlwgLYq0P51EEzuKTL7DnOX29+cIAhCFYYpPc X-Received: by 2002:aa7:df12:0:b0:4ad:66b:84a5 with SMTP id c18-20020aa7df12000000b004ad066b84a5mr361066edy.22.1676841736620; Sun, 19 Feb 2023 13:22:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841736; cv=none; d=google.com; s=arc-20160816; b=JTZ4pqDTraZwxfJsQ+0FoBfc3PnqKbdU4dFw4zLUVKptd98ztHBzsag0i1MrHkNqE7 vZI1GWf3GTtooDQuCtJ0n9HtH3Kc1hPe1enFd6i2NUrqgJhR2ALnSBu7YLmRapQpUdJi sKPjWA7tQlPPK3WLOXJOiS/xM1j+9D/fg9xau9AGdNj/Vzv5HTOuamBRhLD66ce+WBxK jsRr7Xr7gVCWlUlRp4KYPves2r8DjSkY6pzypWEKoPFaN6asMKDIQqUGysoQfMYFQHRH L1hDaNuOijIeDzI0Lu9Cf2SUkyTgZlC6PDf4FHa6sqyCZygdB474pReJaHdLB1JkcGCE /IIw== 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=UkQuOoYWrqHzF7sqnR/KeVzMvcxOpAsOg249BRbujhQ=; b=aa/QdB1uZgh6O1qLx4fJTwQw0ehXIHmvRMUx0GoHa+63EeePVErRnBRWGMQPv8riY8 +o48gDoKJJERvPszzpwX+kExXzzzH38QURm+KlfhtqmnnesSQZezTVWtgIBaTULPdbAP VroJXooQJhirqQfU7FzGCNKUwH8cQwiUiqKaA3ajZh2QgukTvps+06+sHhSYZoorJBWr 7W6Xr4GL/UH+VRJFNZjOzIBtCc9iMr5mCXYDGz35rx6SG6rHw62ML444K0DYvLZTHv/M tZ1luakhJrDOkgT1CBjUlzxopg1wJw9eYmUiu2GDE0x5M6c8nduLP+zu+jRFsOGV2uYt pbcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eTwBnBmD; 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 b8-20020aa7df88000000b004ad7389704dsi10513157edy.177.2023.02.19.13.21.53; Sun, 19 Feb 2023 13:22:16 -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=eTwBnBmD; 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 S231470AbjBSVQs (ORCPT + 99 others); Sun, 19 Feb 2023 16:16:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbjBSVQq (ORCPT ); Sun, 19 Feb 2023 16:16:46 -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 6B5D919F08 for ; Sun, 19 Feb 2023 13:16:23 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id x22so4874245edd.10 for ; Sun, 19 Feb 2023 13:16:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841381; 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=UkQuOoYWrqHzF7sqnR/KeVzMvcxOpAsOg249BRbujhQ=; b=eTwBnBmDfQoWeS10EDjwky+rA+UGnxGDFOZhIcHFvWQTCIIKV30OlrzdZAlQHEQA5X O6Eg1OP0bujKVNOnRyZuikUHSLjI5kamQeJkX/urCLcSrEVaNG74uQmUAiBA0weYAawG yi+YZAxSDRMECPxz1NfT+jGU5dibsJQe0exstoIQ+vAuESkeXhp5ddtBZFIUYWOGzNgF qeGboymTNGlTo9HCjkAmimIlsxLZGBYF3lmTP2Io9ecqHN0Pifgm8I8po5yzmIW8rpzA AYbFi04H0k6kaGWbI+P9EmtbaBCXv4oTqTXOqxJfBkovr6QUDQ8n2nDxn24gMNQjbRYO 5iAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841381; 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=UkQuOoYWrqHzF7sqnR/KeVzMvcxOpAsOg249BRbujhQ=; b=O/2GY5YlZekxphVnd+Lx65nwjkwwJLJBUpIrtmksbfQ2ba+TqxCVam4+Z/gq+ATu8D ANPPyn6FnubJ9IJeWXKwvw8sBlzRKxVHSfD8rm1k2lc7mJlqIDLc5b5C7/pNR9RK2PA8 /9EbPtrO4AnQL9h7Iy+7J3R0/oqWl65OUYIYsAKH5Ot9Yv8lU9IUjiDklG5znNF3b6NT gEb7n+2yVJnH7k1ymEHT0PSaqqyflV1gobXOCAaXoomuyvLWuAvAZRxijNiGEg4+7Dlw b6fHAvz33b940NklUdgUmt3kii6P7qON7g84DoqA+t05XhR79wFSTIbwhbyCWdu56aUE uuSw== X-Gm-Message-State: AO0yUKW74WL9gbZlBaeo/ewX02rpVj6VY6XgmpVyDDKdXFx2DFDC7j3l kdBzR3IZjB7NmMI5Azs4x8U= X-Received: by 2002:a17:906:291:b0:8b1:7ae9:7332 with SMTP id 17-20020a170906029100b008b17ae97332mr9167337ejf.6.1676841381725; Sun, 19 Feb 2023 13:16:21 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id x7-20020a170906804700b008b138641f37sm4820169ejw.24.2023.02.19.13.16.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:16:20 -0800 (PST) Date: Sun, 19 Feb 2023 22:16:19 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] staging: rtl8192e: Remove entry .stop_adapter from struct rtl819x_ops Message-ID: <87f874eae22027956b9f1140b8d460ed8b63a9f9.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758296000735761550?= X-GMAIL-MSGID: =?utf-8?q?1758296000735761550?= Remove entry .stop_adapter and replace it with function name rtl92e_stop_adapter. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 +++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index a4796330f86d..566513338089 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, - .stop_adapter = rtl92e_stop_adapter, .update_ratr_table = rtl92e_update_ratr_table, .irq_enable = rtl92e_enable_irq, .irq_disable = rtl92e_disable_irq, @@ -756,7 +755,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf) } priv->rf_change_in_progress = true; spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - priv->ops->stop_adapter(dev, false); + rtl92e_stop_adapter(dev, false); spin_lock_irqsave(&priv->rf_ps_lock, flags); priv->rf_change_in_progress = false; spin_unlock_irqrestore(&priv->rf_ps_lock, flags); @@ -2055,7 +2054,7 @@ void rtl92e_commit(struct net_device *dev) return; rtllib_softmac_stop_protocol(priv->rtllib, 0, true); rtl92e_irq_disable(dev); - priv->ops->stop_adapter(dev, true); + rtl92e_stop_adapter(dev, true); _rtl92e_up(dev, false); } @@ -2401,7 +2400,7 @@ bool rtl92e_disable_nic(struct net_device *dev) _rtl92e_cancel_deferred_work(priv); rtl92e_irq_disable(dev); - priv->ops->stop_adapter(dev, false); + rtl92e_stop_adapter(dev, false); return true; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index d83af5f8ce82..083bba3dc51b 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 (*stop_adapter)(struct net_device *dev, bool reset); void (*update_ratr_table)(struct net_device *dev); void (*irq_enable)(struct net_device *dev); void (*irq_disable)(struct net_device *dev); 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); From patchwork Sun Feb 19 21:16:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006516wrn; Sun, 19 Feb 2023 13:22:43 -0800 (PST) X-Google-Smtp-Source: AK7set/Sm2JxlPDUTOlwtIMXpNF9sZfNt8jq56dOTa0AGW6HwSfD9Vck0GyCYLgAPX5TXnGe/Ld1 X-Received: by 2002:a17:907:8d11:b0:87b:d3f3:dcf3 with SMTP id tc17-20020a1709078d1100b0087bd3f3dcf3mr7167638ejc.35.1676841762973; Sun, 19 Feb 2023 13:22:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841762; cv=none; d=google.com; s=arc-20160816; b=U1qakGeaJq7nsD/6aXGLpDN/+3erIYjva0a+e/QZkMvRsoaONT3TxWD6kwnee13Aow QO1tlpiHvPCnNOYy3Y+B1aVsyoohDthSJpYAlLxxldUUN8gZrzzUCBhj9tR9Al3pupgE er/tx0g2w08mplpBnSQ4JCb/ul18J/itwLqpIxhHxP9j9NFvJ/zPh1fDexWtLuaik/n8 u7toJWsV7hDCjmgEmXebDDscb7Qp2RttFX+b9nwO0ZdnZRgPjhPuzNJcJNrSJ1orF7GV rkboSG1ll+qP50Gr8nWV1/1KL6yyMPGH8EcpISQOVVFCIWuxXWXoY41VJibYHuwodhoz Bh5w== 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=PD9atmMnnpsURBtqJPW0p5QrUQNp837QeANxxAzZuD0=; b=ay+RbNLD/gLZwcTRZ7B9JMpVdhPcZGqlpeGTqif6T7VfGJedHBI8+fHsl6qmGI+HtZ hyQwbUBPGKJpGOWV+wuM6qPuxnLgl3Pmu3T1V2In4jX0HcYBtFb8DtM//62SLS0hPzOO UJAYPOuo2bmPAZbtzS6mgM1xdG5j1/KfbP+vEAjAsiSHgcc/KlJ7APB4Vs4/BmLiOJTB NsMHN2e6N/KM3F6Eifbv+pvTU5srUY76DRgTBlZx17nPG7cS80kjE/EFjAKr4sVQhC+3 Qgm9RmFTwbxckoH2uKwn5+LprYyWYp/HjtjocC/sAi0zn8LZblqOUvQNJpP6VfgdjOPh M3kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TpR55Vci; 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 q9-20020aa7d449000000b004ad7c1ef7c7si10268955edr.506.2023.02.19.13.22.19; Sun, 19 Feb 2023 13:22:42 -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=TpR55Vci; 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 S231690AbjBSVRF (ORCPT + 99 others); Sun, 19 Feb 2023 16:17:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231687AbjBSVRD (ORCPT ); Sun, 19 Feb 2023 16:17:03 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 079EE19F15 for ; Sun, 19 Feb 2023 13:16:40 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id x22so4875532edd.10 for ; Sun, 19 Feb 2023 13:16:39 -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=PD9atmMnnpsURBtqJPW0p5QrUQNp837QeANxxAzZuD0=; b=TpR55Vci45jz0c2/WF0iVeQh7rywmQY76d+1afkeAR3ER42d2A3TsB0S1WtSUek8Wt ntkmMIbEXl28tfBRpAHy1oyl8CxcxYtT5wGmRVYxVwuwEC3MU5Vb3DKSekdtat/YV5hE W4pR+jDnY8RQlddHKJ3SK2T6QrA4mIQ4Pq2rTbtp+orHb1jxT5FLrOnyLHML8qRdqdd0 OtQDBFb+CyQAg6JIGUZTOlGKMpDIX3acaiH/6btt5d0TywQyTI5X/42vybSmxxa/QThT lDt2BdBetjDoGEv2hTul8Oi9DTmdeEby79uBZXssDqrLLCONZBUUhEJFVMgaBaU+9ux+ gW0A== 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=PD9atmMnnpsURBtqJPW0p5QrUQNp837QeANxxAzZuD0=; b=m50Um0Q4vUle9XrdpdKQfcMJthbrN2UvZr1y5iUcfQ+y987Wo5pH+8oswIsg2BIHA/ bgUudouaqBc6E3roiln29uoPXL+QDHX6hWE2n0AZkJipNLxS9ILqiI8Vvv6ZyK3rPx0H vaTIv4KCEu6BsH2Zf/8tUWLdiS6jH74m7mf+P7QJD5ni8wd2ZJTA/HF4EoPE4xyby2Iz 8EhuQyrMT5ppiDCIfskdzmRGeFIm5rK6aosYuFGy9p/HtymP28EV7+6sx6W5mDcsMq9w KIIdlC85Gc8f5H614SzFL42jyFNFrYgMXzZxNQ4E7El/+4NlDag+B5WLN/cCBj0TtjJy cI6g== X-Gm-Message-State: AO0yUKU/wplpKBu/6sEn8l6ZXd7MTC/Wl/E+K00HnWKh2fC9Vk/DEpO0 VuYwsFv5hETN87rwo38h/XY= X-Received: by 2002:a17:906:2cf:b0:878:5fa4:7443 with SMTP id 15-20020a17090602cf00b008785fa47443mr6702157ejk.3.1676841398012; Sun, 19 Feb 2023 13:16:38 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id l27-20020a50d6db000000b004aab36ad060sm40693edj.92.2023.02.19.13.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:16:36 -0800 (PST) Date: Sun, 19 Feb 2023 22:16:35 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] staging: rtl8192e: Remove entry .irq_enable 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?1758296028572272367?= X-GMAIL-MSGID: =?utf-8?q?1758296028572272367?= Remove entry .irq_enable and replace it with function name rtl92e_enable_irq. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index c7561e486359..0b6d3b3c6415 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, - .irq_enable = rtl92e_enable_irq, .irq_disable = rtl92e_disable_irq, .irq_clear = rtl92e_clear_irq, .rx_enable = rtl92e_enable_rx, @@ -247,7 +246,7 @@ void rtl92e_irq_enable(struct net_device *dev) priv->irq_enabled = 1; - priv->ops->irq_enable(dev); + rtl92e_enable_irq(dev); } void rtl92e_irq_disable(struct net_device *dev) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 10ff4f9ec760..6b5761374d54 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 (*irq_enable)(struct net_device *dev); void (*irq_disable)(struct net_device *dev); void (*irq_clear)(struct net_device *dev); void (*rx_enable)(struct net_device *dev); From patchwork Sun Feb 19 21:16:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006595wrn; Sun, 19 Feb 2023 13:23:00 -0800 (PST) X-Google-Smtp-Source: AK7set//9nUYpcFf4nDc6SIRJ0mFWHAVkyFnAjTsZ9Kbs3j8Z/posGWViQqC6RetKsj8557zy6Aq X-Received: by 2002:a17:906:370b:b0:88a:b6ca:7d3d with SMTP id d11-20020a170906370b00b0088ab6ca7d3dmr6390252ejc.8.1676841780762; Sun, 19 Feb 2023 13:23:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841780; cv=none; d=google.com; s=arc-20160816; b=KhPQ0vhmZywww5ucndaIkmQiB7Pv2XDu2yA1V3iEAw8T/KtPzm0U0COg3N4pi28SEH pPpbVvZJm1Radv3IdTflt77CF+cnJ9leHeLRHRZLZAmrCFwWxAVDPDQBZVmjMv11ATTc bkvh0YuTmLDfM8nVxwC0pUv76RTve3NhebokJo5ItVgzunTdU8ZJ0hu7kuaJRhjRBomF c2IT+QgYDZdTC0fOF0SKdO2lDINKrvykKiCmV7AKcyOJWSyICllgXcyqexdFXDV2w2Bg 68mQZiqz3KmfHaZ/p1fnBH2lAyzirxIj/JNzCQ2ryc3Y/+GxWMS/lsTu1NQ7gq5vuJrc i4Nw== 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=kJzRMtb6Oi/vr369AWzX9RrX430GIMHRsf+vAntxEl0=; b=iKe4emku6SlgTAFapBn5E78ksyT+fK6ZaNKGUW41B7m2OnJ1l4T4OaL5C6dDOLwaoV rPHFsMuf5iJb+48nKvMhe0xd7FwDvAawBPCH2zZIsE3fw6DU91ZBGZUjDMEaBaiVba4q zL6mjd/xUD+OXnLLQ03QeBTfcBBgVZTAmmkwpD8OPNue/HgVn28XJsLQYRTruZgo7PrD AHfhB/OBr4xuC7sWnWNXP9CP9xMjUoiGZVwlVa4etokqHOoGLN6CjSN61/WKZXMVYsmG asQ9GgpPE3vGkpdgVPOUGv5yHZe2JIFTr5DLFAK+C7nWMXpFRT2EivRSycgz4cI6wozw 8kOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=VGUlv9bD; 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 uo19-20020a170907cc1300b008b17a1f0979si9704179ejc.319.2023.02.19.13.22.37; Sun, 19 Feb 2023 13:23:00 -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=VGUlv9bD; 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 S231411AbjBSVRQ (ORCPT + 99 others); Sun, 19 Feb 2023 16:17:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231707AbjBSVRN (ORCPT ); Sun, 19 Feb 2023 16:17:13 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17D5A199F8 for ; Sun, 19 Feb 2023 13:16:48 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id er22so4720081edb.4 for ; Sun, 19 Feb 2023 13:16:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841406; 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=kJzRMtb6Oi/vr369AWzX9RrX430GIMHRsf+vAntxEl0=; b=VGUlv9bDsQzX2DEfv5HHv3yUl8lm+2lF5JJENsRL56LksFQftkYBNF3cW3HNODCk4+ oSmBW2zVEMbWkpUntpElgIw4JTw6jIl+pzqBDkmIy1pu4+WeyIQAWL+AIJgHdBwSW3OE 03zJXmu0dr3wykIye7Fyt4LoO3auO0q3QYGaVnQWv/93JrZqQEU+I1TNttxJ7Bw8JH9n 8jLd/O98E16ZPV1qOe+9svJLsZCYbmnRXItgARLcwNVqu8Dl+ZeY2ExntCFpOfPmwN3Y j6ayyl3i68ksvSjviT7GKmUpUlFB9YR03Qq4LHZyn5Q9PtUfUK8vL61Nx0uIMAEgvNNy o7+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841406; 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=kJzRMtb6Oi/vr369AWzX9RrX430GIMHRsf+vAntxEl0=; b=ydqyNbV8bpRsYbI08rEnS55mHCyIXpXt9GZ3EJrYlNx4IefiGbhjNm4uwknmgtz1i2 lVOMr+Zl5atyiv2HfF0Sok4g6rj6nDXpfhJ19XZ9eYWUAa5/leafUy8KoibU837CJ972 8wHaslVcHE/73dHKhNunqJ9bBKNYCDf0VC7DlIjRbrEoUsijT45wn8+9GLJAiPXx5pLM UCSkEX5QmZz1eahWHv06lcO7aGU6ZyEoMb9GaJXWColFtJo+CwCLyMUSW1WsmL5U530J Uh5bv91ggekIGTqusYUWuz/Wwmtcjdi0Zc0vOs9Nb40t+6UjQQgutPPhpxxIr4esuoYF snGQ== X-Gm-Message-State: AO0yUKWb7TjDntPJYFBSYm5sLwc84e511Hj6XE1P1Yz33Q613ORA1Lpz HxQU9vuwliBAUgAMzob4vesYWIIjhUc= X-Received: by 2002:a17:906:150:b0:894:4341:77d6 with SMTP id 16-20020a170906015000b00894434177d6mr7445896ejh.1.1676841406142; Sun, 19 Feb 2023 13:16:46 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id ce6-20020a170906b24600b008b1fc59a22esm3620692ejb.65.2023.02.19.13.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:16:45 -0800 (PST) Date: Sun, 19 Feb 2023 22:16:43 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] staging: rtl8192e: Remove entry .irq_disable from struct rtl819x_ops Message-ID: <6d981b554a73ca965096e434d687b9827b0b96b2.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758296047610726529?= X-GMAIL-MSGID: =?utf-8?q?1758296047610726529?= Remove entry .irq_disable and replace it with function name rtl92e_disable_irq. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 0b6d3b3c6415..978088ab076c 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, - .irq_disable = rtl92e_disable_irq, .irq_clear = rtl92e_clear_irq, .rx_enable = rtl92e_enable_rx, .tx_enable = rtl92e_enable_tx, @@ -253,7 +252,7 @@ void rtl92e_irq_disable(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - priv->ops->irq_disable(dev); + rtl92e_disable_irq(dev); priv->irq_enabled = 0; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 6b5761374d54..eb2b1e2ce4a6 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 (*irq_disable)(struct net_device *dev); void (*irq_clear)(struct net_device *dev); void (*rx_enable)(struct net_device *dev); void (*tx_enable)(struct net_device *dev); From patchwork Sun Feb 19 21:16:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 59218 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1006908wrn; Sun, 19 Feb 2023 13:24:29 -0800 (PST) X-Google-Smtp-Source: AK7set+XzGbPat91Ty5KmqgPO4GZ8lPaiG/5P4Sv1SloLRF7j0KXkZvt+WjDgctpJuIHDf78XJYH X-Received: by 2002:a17:906:53c7:b0:885:fee4:69ee with SMTP id p7-20020a17090653c700b00885fee469eemr5855342ejo.59.1676841868823; Sun, 19 Feb 2023 13:24:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676841868; cv=none; d=google.com; s=arc-20160816; b=ypdXUcNI0Y9K1PUeE6+ptQafQl0LkcJ7DICpSpb+/KqTeQhcbsyhcGcxd/47xJE84I XX4fQCcJ3M3ZFBm71bUyrpY/8+evbJ/2iejXLDcbKnET5meK5NpR9pHkqrA0AcY08z/Q /v8SSSXAcjfQHY0Y+Bf+xIUymyGMU7jLQYTK8uaV9ux0WxRjMYFzsWv7rSxV6ojXVIJ8 ATZv+RuvzJrnXb2dis8B/jajK8ONaylqosKCnzLV7rkfqzOVIZ2hVbMl+1tToqaS/y9V VYJqD27/O1fDEEdgs/YVORD9hCSVSIxvSOqZlP+ToVos4a3pzK/2gp2XNtSnZVrfffWe MuGw== 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=WI6z7LcNNkMYnP9QmQ96gaD5uwzVY4/0FvG8064MqWI=; b=0H/65w4/rgICgLIHM8dlW1RADITLyX+XaLvxvpWsMPxdNvAxTtmMyLSxzs6G24p0by 5FTeym15WKYmNxgdhG2G+4Q+5wDgQKGL36eUQUtpK0VRmYizN6R7s+K23t6SzhpfWYdh L0hA9cylr093dCul96Asd9PChQfKhqhgUJDm/YYqE+3VrxReAQXMgLaBg1BDRDbu4Wyx xOfCSak5hTCZJ9evhnBb54N3RQuIbxIU11LxYf7nfrHH/55KkdV+HPy8bok34ugCRcrM +bOcfEOZLy+K0snJ8EQVpHNDSpSYgjW63V9+31T4yV7oFf7hq48d2rG7QvczvUrrCdmQ mnPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z5eDT4Rq; 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 kb17-20020a170907925100b008cdb0cd5e80si2337689ejb.107.2023.02.19.13.24.05; Sun, 19 Feb 2023 13:24:28 -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=Z5eDT4Rq; 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 S231683AbjBSVRT (ORCPT + 99 others); Sun, 19 Feb 2023 16:17:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231687AbjBSVRR (ORCPT ); Sun, 19 Feb 2023 16:17:17 -0500 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 345EC19F3D for ; Sun, 19 Feb 2023 13:16:54 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id eq27so2215893edb.5 for ; Sun, 19 Feb 2023 13:16:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676841412; 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=WI6z7LcNNkMYnP9QmQ96gaD5uwzVY4/0FvG8064MqWI=; b=Z5eDT4RqT+1DhLQXpGq8nFTzK5w9VmO+bORTFgxfaDXeOXyga1BLYyAwqPpUodd3PI ALKnFYB+PBQpqtI03FWhtIRS4TFlGkaRjxR+wMhFDgu62P1g3e2I2Orq4soysmTCjiBC a00SQh9ESv2aptqM16gNE5VLqWm6SCeC1qXZlYXwrIywbpJALr6c9qNdQ3QpQ/eRVfec lCm2KZpF0c5ui6Ne1CuDKGlZIgQQMJSHAtmPvP7ZY52Oimmg/P8/5mKxusiOb0IJ8k0o 8uADwMPteC1zIxmA1he7N+4bZUSUcfXeVzRsK+Wy56yoxb6+DY4CdDdDt6zkebe2Ge90 QygA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676841412; 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=WI6z7LcNNkMYnP9QmQ96gaD5uwzVY4/0FvG8064MqWI=; b=k5469O8uyIUIuuJ4sdcTWh+KVJCEC5QVh1ml/9gYwlnYbmhDgVRq6jHGSzAytBpytm gGO2ess0e4XLA/pUEj+ulj73fWCk5GfFo+mFh9MjovD6WF7quJKlEYdZBWrbID8DxCwg B6en1FHJjzdbelNQrzOTQ7YJGri/Wx4OyFW/rWEmYz1W47nqCFijDbwAskvAWQ/p7SDQ /eHXbdukNdfAgMh7bLMdnAFtIBlJ2FMLKE1qv5dQrJwpTeacesTeHqMTGJpFEVg49FDc RF9ZIG8+5yySLxaoQaSfRAdgxZ+/GcpT/YIJM0jAC22atOblzS+R19wIGO3ij8WBHgGx SvRw== X-Gm-Message-State: AO0yUKWjj4slc82d3ZFSM1s3y6w9NSuyOhTTSqTB3stTyaWTf+E56qqy 65J2w8EQJ3UqWpxMVTCS/isXdvRGfGs= X-Received: by 2002:a17:906:d4:b0:8bc:4c76:6f87 with SMTP id 20-20020a17090600d400b008bc4c766f87mr4698028eji.0.1676841412421; Sun, 19 Feb 2023 13:16:52 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id hb22-20020a170906b89600b008b14d3978adsm4811722ejb.189.2023.02.19.13.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 13:16:51 -0800 (PST) Date: Sun, 19 Feb 2023 22:16:49 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] staging: rtl8192e: Remove entry .rx_enable from struct rtl819x_ops Message-ID: <8fd6c4b18cff8662215e27d299205646ce720a3b.1676840647.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758296139866730775?= X-GMAIL-MSGID: =?utf-8?q?1758296139866730775?= Remove entry .rx_enable and replace it with function name rtl92e_enable_rx. This increases readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 5 +---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 978088ab076c..aa0456931b09 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -30,7 +30,6 @@ static const struct rtl819x_ops rtl819xp_ops = { .link_change = rtl92e_link_change, .rx_command_packet_handler = NULL, .irq_clear = rtl92e_clear_irq, - .rx_enable = rtl92e_enable_rx, .tx_enable = rtl92e_enable_tx, .interrupt_recognized = rtl92e_ack_irq, .tx_check_stuck_handler = rtl92e_is_tx_stuck, @@ -1400,9 +1399,7 @@ static void _rtl92e_watchdog_timer_cb(struct timer_list *t) ****************************************************************************/ void rtl92e_rx_enable(struct net_device *dev) { - struct r8192_priv *priv = rtllib_priv(dev); - - priv->ops->rx_enable(dev); + rtl92e_enable_rx(dev); } void rtl92e_tx_enable(struct net_device *dev) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index eb2b1e2ce4a6..71958c7a4cbf 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -211,7 +211,6 @@ struct rtl819x_ops { struct sk_buff *skb, struct rx_desc *pdesc); void (*irq_clear)(struct net_device *dev); - void (*rx_enable)(struct net_device *dev); void (*tx_enable)(struct net_device *dev); void (*interrupt_recognized)(struct net_device *dev, u32 *p_inta, u32 *p_intb);