From nobody Thu Sep 11 14:13:38 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 048C7C05027 for ; Sun, 19 Feb 2023 21:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231679AbjBSVQs (ORCPT ); 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-Google-Smtp-Source: AK7set9RxbcbXqVJEalEi/Dn8n3BHyB8HCN8IPRF8iKOMldXQfL00wr8VIAHqgNVB+0NzcqxvvdJGQ== 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: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D { .nic_type =3D NIC_8192E, .link_change =3D rtl92e_link_change, .rx_command_packet_handler =3D NULL, - .stop_adapter =3D rtl92e_stop_adapter, .update_ratr_table =3D rtl92e_update_ratr_table, .irq_enable =3D rtl92e_enable_irq, .irq_disable =3D rtl92e_disable_irq, @@ -756,7 +755,7 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) } priv->rf_change_in_progress =3D 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 =3D 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); } =20 @@ -2401,7 +2400,7 @@ bool rtl92e_disable_nic(struct net_device *dev) _rtl92e_cancel_deferred_work(priv); rtl92e_irq_disable(dev); =20 - priv->ops->stop_adapter(dev, false); + rtl92e_stop_adapter(dev, false); return true; } =20 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); --=20 2.39.2