From patchwork Mon Jan 23 20:53:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 47378 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1810665wrn; Mon, 23 Jan 2023 12:55:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXsbsjdVj8XXorbxZSMTDA0c4mU5gnrM/Cf25Fwn3rsNBP0aKoQ+R9UVoF+3xfpkQeQTGuHw X-Received: by 2002:a17:906:6d99:b0:870:58ae:842e with SMTP id h25-20020a1709066d9900b0087058ae842emr25575017ejt.24.1674507308645; Mon, 23 Jan 2023 12:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674507308; cv=none; d=google.com; s=arc-20160816; b=w+yTsCnUUbD4bDBl80BnUVWRWaQyNvk6eHjYJfZTajMe4IEbtXd0/HL4zdqdxhpPZT WoxEhfmlW4/bw4L8347gN5ikadaSzEGA88VQfJXAWvo4QmmHh7eSFpy6YKqzcf2Nv4YP kQxtBE+VuP/QB7eJjH+LSHptpgdTFZm/eXB1GbDq7UjBm7XKR6vvSAxbZ/qGjH9ovGCk dN2079MA8sPgjfR0HpEWOwiKIUfPGo668fn6eeL0Cv9MhZgHFrrigNSaZqzSkRD4NDj4 WBxrndVA7pJ50AxKVV5qN+icILbXVcl2ca+MDf7ogiHzIilJaSMmOfGWyis9zu+uCLif VNrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=shOVnwlnoa30gNx4hfB4z3eh8SEpgooftb+mKN07HeM=; b=rdBFxSLE/ahid7+l1yKC1wP3hcqSF0+HL6l0MIks92fqSg9n3DCJmqbQrphQ514TUC n4qoaVaOpJrrmyqUSV42QndOoiZHAGoO4QdoVeuXhzbH/2C06LZZFRlBA21hRTWl+/5E TJCvpzJkuiviIj+NtPtuMvFB5/EaZL4GOhGrzw8bPXGvwRLoa9FbFgph6DNKh3Kx1mm+ JbdqozMN323XdHB+ZyMKh2jmlin+MJbJU/4ImML7t+CYZ9VMtxcEbnw+6358zVMMhbme uNSCCVqBkxgtN0zH+DhkHkkbG3tE6C6OIxkrhY9JUQ/vNEU8+Dyt/94Sm/Kl8GxJDWED AcVw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 24-20020a170906009800b00877aab5d2d3si8621082ejc.95.2023.01.23.12.54.44; Mon, 23 Jan 2023 12:55:08 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231951AbjAWUyL (ORCPT + 99 others); Mon, 23 Jan 2023 15:54:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231717AbjAWUyD (ORCPT ); Mon, 23 Jan 2023 15:54:03 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E755B11654 for ; Mon, 23 Jan 2023 12:54:02 -0800 (PST) Received: from ipservice-092-217-089-134.092.217.pools.vodafone-ip.de ([92.217.89.134] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1pK3pF-0000Lk-NR; Mon, 23 Jan 2023 21:53:57 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 03/23] staging: r8188eu: remove struct intf_hdl Date: Mon, 23 Jan 2023 21:53:22 +0100 Message-Id: <20230123205342.229589-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123205342.229589-1-martin@kaiser.cx> References: <20230123205342.229589-1-martin@kaiser.cx> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE 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?1755848175722431595?= X-GMAIL-MSGID: =?utf-8?q?1755848175722431595?= There are no more users of struct intf_hdl in the r8188eu driver. We can now remove this struct. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/rtw_io.h | 6 ------ drivers/staging/r8188eu/os_dep/usb_intf.c | 6 ------ 3 files changed, 13 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h index 614673902377..7b170eed66b3 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -152,7 +152,6 @@ struct adapter { struct mlme_ext_priv mlmeextpriv; struct cmd_priv cmdpriv; struct evt_priv evtpriv; - struct intf_hdl intf; struct xmit_priv xmitpriv; struct recv_priv recvpriv; struct sta_priv stapriv; diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 0d2aa432f88d..033ea7146861 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -17,12 +17,6 @@ #include struct intf_priv; -struct intf_hdl; - -struct intf_hdl { - struct adapter *padapter; - struct dvobj_priv *pintf_dev; -}; int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data); int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data); diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c index 1f70e5fee1b2..1f114b1fc4d5 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -290,7 +290,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb { struct adapter *padapter = NULL; struct net_device *pnetdev = NULL; - struct intf_hdl *pintf; int ret; padapter = vzalloc(sizeof(*padapter)); @@ -317,11 +316,6 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb padapter->intf_start = &usb_intf_start; padapter->intf_stop = &usb_intf_stop; - /* step init_io_priv */ - pintf = &padapter->intf; - pintf->padapter = padapter; - pintf->pintf_dev = adapter_to_dvobj(padapter); - /* step read_chip_version */ rtl8188e_read_chip_version(padapter);