From patchwork Wed Jan 11 19:56:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3510845wrt; Wed, 11 Jan 2023 12:01:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXtgup8VpeveEOrjIERYsRoHlWZ3Eg7vANtUJWJP7HcMN3OB/APS2WgQ8BjJ6RkQekM6SxBV X-Received: by 2002:a17:906:b0d2:b0:7c4:fe36:5b80 with SMTP id bk18-20020a170906b0d200b007c4fe365b80mr74101520ejb.62.1673467297456; Wed, 11 Jan 2023 12:01:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467297; cv=none; d=google.com; s=arc-20160816; b=s3A7DH8Mi1b6uwf54xltaTawBtXbqu3lGw2PM0e6VosB6GxMwPp05uv3iL8zsYI+U1 OcH1OlS5kzrlf60sa8ZEoa2UHveF1exIVbo37IeTViaBMdduTzrSSSj+2Eh8++WkDq57 e30mkNl9xXg07SKXPYUtJOiGSdn2DONPmmn/cOkdx0ENN8wnxGi2GalopaKInQTIyzJ8 cnYgxU4mkgk8OIcxegB/uVYIT0m4PnI+uMTlb1J57oWYhWjRru1dyB9KM1Gp1WC7dtzo TjNGkQVU0hHgqltOYIw9+twMBlgzPJqTPlv0tdq0ycGkA9SvYuVFOMjxDBJsIJUHnKq5 Yqww== 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=KCOf1NAQg8civRVTClDEe0Dp1a+87FzGzUMmmRYh0UESzCLtPcYEjZYWP4Sve60qyB QduxusuIrgV6VaAVDveu36nF9ViiHDWIolXCdzUDDVwWMIgp2W/AASEssrv4PrULen+R CTA4iWvOABcVSAwrAdAOsyVF7jXDQ7ugZs7T0QduFdtNub7ZJaTRTgdSdBUvVmPClIxX b0XUSpluheOQ3jL8pHwH/uZn7XQmX1EF8KBCT98DMRB4bOmCybrvRis9oFWsXNhDwtQY 3QdqX+YIKWPCsFz/6ZR1pNqidTQzCcQy8eydU/llAQEOohRzj0fkYlJvsYWC6asw30CX 8lOA== 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 dn9-20020a17090794c900b00855da26bcd6si6067755ejc.939.2023.01.11.12.01.12; Wed, 11 Jan 2023 12:01:37 -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 S239679AbjAKT6m (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235549AbjAKT5O (ORCPT ); Wed, 11 Jan 2023 14:57:14 -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 C45D2E020 for ; Wed, 11 Jan 2023 11:57:13 -0800 (PST) Received: from dslb-188-096-145-172.188.096.pools.vodafone-ip.de ([188.96.145.172] 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 1pFhDg-0005F2-67; Wed, 11 Jan 2023 20:57:08 +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 19/20] staging: r8188eu: remove struct intf_hdl Date: Wed, 11 Jan 2023 20:56:39 +0100 Message-Id: <20230111195640.306748-20-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230111195640.306748-1-martin@kaiser.cx> References: <20230111195640.306748-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?1754757645108348536?= X-GMAIL-MSGID: =?utf-8?q?1754757645108348536?= 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);