From patchwork Wed Jan 11 19:56:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42161 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3508895wrt; Wed, 11 Jan 2023 11:57:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXu2qGO+hqfMrd6b7bgcDPRkXyH+Q6JU/xF5D3EIrtX0k2pRT6/M0Fwf3f0UK/576PhU+Ap0 X-Received: by 2002:a05:6a20:d006:b0:af:c491:c7d2 with SMTP id hu6-20020a056a20d00600b000afc491c7d2mr69000663pzb.29.1673467058716; Wed, 11 Jan 2023 11:57:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467058; cv=none; d=google.com; s=arc-20160816; b=xf72ltIQh/ejS+gDNGwrU4HFrvOFQMMzHtBBTkJkek0tvnSbOjvWiG/DXipjuuFeG3 7PykCPszX3DDlMMXMfZr2+wvv2vp+GjX1UIFyoy7+AjtyMmilqhYCuJamWlKQNjc6vcm 2ZggRE195wvVWmVna7MIxhXPJKBTCDsoSVGZ4Lz7TSL5cVpXFNCJeqR4OenKcTSw1Ty7 FSaXDI2DlrHYx824a2RBanKZjACttjB2DLi0OgMm/2Lo8weEdDpjR1aTYiivIATJIwlt 7Hmn6JRbO0tQXHDsIrWZzDWFPNZI3S6+jGv4H6qjCPwjtlFhqYZLicP41GwdH0wsMPS9 tgZg== 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=Yw9nBlEGn81EqFLhqVbLCa1beJ1ms2jwyu7e3U4DwzE=; b=BXhqoN8gzEZ1tJHCIC/GwK27i+sHmsffqbgnyzx2aeAxbPBU0FX2vxLX+HwpYN3YUM MX1Xr9cpUMtrZceqxQh+/g10RAAhtWHzt9F4Tf4SzxOYzz7nle4iZHJ2zA8xFFLT+tEm eJnog8Yg2HWuj0xCDrUp+kjnahdVbX7GDpts5JjlnBEOW1IdinMyZmWTksqFLZbgtoyH D68woy5Z3FO4cl6zrUi86pcHUf1ZAUmk60kLjVnfcRjpayVrGz0dTd8duYKEe9QeLohb +nDiE0zSbU+QICTSm+wBQQV9+Mdkup+AGRtf50KLcocSb5onDA7TLcrxGjem8A80f8Hk 3ssA== 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 l11-20020a63570b000000b0047ca55a11eesi15358269pgb.297.2023.01.11.11.57.26; Wed, 11 Jan 2023 11:57:38 -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 S235212AbjAKT5K (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229935AbjAKT5B (ORCPT ); Wed, 11 Jan 2023 14:57:01 -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 0E08C1789D for ; Wed, 11 Jan 2023 11:56:57 -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 1pFhDQ-0005F2-Hi; Wed, 11 Jan 2023 20:56:52 +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 01/20] staging: r8188eu: remove struct io_priv Date: Wed, 11 Jan 2023 20:56:21 +0100 Message-Id: <20230111195640.306748-2-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?1754757395021770685?= X-GMAIL-MSGID: =?utf-8?q?1754757395021770685?= struct io_priv has only one member (and a pointer to the enclosing struct adapter). We can remove struct io_priv and move its member directly into struct adapter. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 21 +++++++-------------- drivers/staging/r8188eu/include/drv_types.h | 2 +- drivers/staging/r8188eu/include/rtw_io.h | 5 ----- drivers/staging/r8188eu/os_dep/usb_intf.c | 5 +---- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index a238d29a3a46..0deaa5c24ab2 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -95,8 +95,7 @@ static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size) int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data) { - struct io_priv *io_priv = &adapter->iopriv; - struct intf_hdl *intf = &io_priv->intf; + struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; return usb_read(intf, value, data, 1); @@ -104,8 +103,7 @@ int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data) int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data) { - struct io_priv *io_priv = &adapter->iopriv; - struct intf_hdl *intf = &io_priv->intf; + struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le16 le_data; int res; @@ -121,8 +119,7 @@ int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data) int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data) { - struct io_priv *io_priv = &adapter->iopriv; - struct intf_hdl *intf = &io_priv->intf; + struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le32 le_data; int res; @@ -138,8 +135,7 @@ int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data) int rtw_write8(struct adapter *adapter, u32 addr, u8 val) { - struct io_priv *io_priv = &adapter->iopriv; - struct intf_hdl *intf = &io_priv->intf; + struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; int ret; @@ -150,8 +146,7 @@ int rtw_write8(struct adapter *adapter, u32 addr, u8 val) int rtw_write16(struct adapter *adapter, u32 addr, u16 val) { - struct io_priv *io_priv = &adapter->iopriv; - struct intf_hdl *intf = &io_priv->intf; + struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le16 data = cpu_to_le16(val); int ret; @@ -163,8 +158,7 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val) int rtw_write32(struct adapter *adapter, u32 addr, u32 val) { - struct io_priv *io_priv = &adapter->iopriv; - struct intf_hdl *intf = &io_priv->intf; + struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le32 data = cpu_to_le32(val); int ret; @@ -176,8 +170,7 @@ int rtw_write32(struct adapter *adapter, u32 addr, u32 val) int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data) { - struct io_priv *io_priv = &adapter->iopriv; - struct intf_hdl *intf = &io_priv->intf; + struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; int ret; diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h index 4803d0c77d70..614673902377 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -152,7 +152,7 @@ struct adapter { struct mlme_ext_priv mlmeextpriv; struct cmd_priv cmdpriv; struct evt_priv evtpriv; - struct io_priv iopriv; + 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 e9744694204b..c15b2e873fd5 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -203,11 +203,6 @@ struct io_queue { struct intf_hdl intf; }; -struct io_priv { - struct adapter *padapter; - struct intf_hdl intf; -}; - uint ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); void sync_ioreq_enqueue(struct io_req *preq, struct io_queue *ioqueue); uint sync_ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8188eu/os_dep/usb_intf.c index 5fbfbcd95de2..1f70e5fee1b2 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 io_priv *piopriv; struct intf_hdl *pintf; int ret; @@ -319,9 +318,7 @@ static int rtw_usb_if1_init(struct dvobj_priv *dvobj, struct usb_interface *pusb padapter->intf_stop = &usb_intf_stop; /* step init_io_priv */ - piopriv = &padapter->iopriv; - pintf = &piopriv->intf; - piopriv->padapter = padapter; + pintf = &padapter->intf; pintf->padapter = padapter; pintf->pintf_dev = adapter_to_dvobj(padapter); From patchwork Wed Jan 11 19:56: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: 42162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3508919wrt; Wed, 11 Jan 2023 11:57:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXu+ypLTwia+Xx9Q8BqL5LIW1+L1d2L5JwGZKzYQzFi2HL/LYHOdimUEDnwjHGNvgAEF468C X-Received: by 2002:a17:90b:897:b0:226:3a7c:f248 with SMTP id bj23-20020a17090b089700b002263a7cf248mr3909338pjb.24.1673467063592; Wed, 11 Jan 2023 11:57:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467063; cv=none; d=google.com; s=arc-20160816; b=IuYh5yHr5Gd3Vu2qpDpORKELh15kUKAi8lF+QML9gdNGmoAmIZmo2boYVZ3fBFdwLo 0II45pFKiNfzeTf4hB16U6/R+Dj4AvHRvYGfIIFcqd8dkZxIWth2xSQa7p5Q+fgH/NJ2 z+7wO3+kRGrojzw23eZkNpoUv0dRfcdh2jSyfAHSILnOsyt+2tWklKAdFnmTr6B7Dx6w 8NRJWP0+h6p5gYcVzP5WOjSDaMpRO49h8jU/nYB+mjo2uuDex8aXyWng5W1gl4i+ABbT jFMzd37QMsSmPp79GIU60CIiKLAO7GIj02ehlyzj/FzqLXlPkkja+BcJ5WzbWAnpgBR7 G7HQ== 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=uqoM4D4j757o60NTOCAcn+aoO1rUB3HdCqsAgWJynIc=; b=Z+RuUu4JtCaVpTnSjkq+W/V2eJRMEJ0QP0wKjMN5OKoAZp4UVwg9fIP1EwEAKFWjlJ dxvtgHyLAyDomsf1uSvT/mF5f2OnqO7GPWQI57k6QmhVjl7+SCy5WYO0Wy5tM6bDv10U 3xp0nd+SCkwFEr5GjYTTmMwFNxAGLhNa7esxqICKsSgKRqV1c0FRuMpQJ1PTSaj/xUNt S7PbbVzbHhStWAPle63QV/WOLTwKLRygQPR8WS6C5yXOfGJU8bJcR7mn3JxtQfK4D6hc whMfT+vRyjAT/XNP8XBEI6deJG8r0vmXxp7gyBSbuUBN9QTJRKPXTB1OmbgsPXwHpx5P OZWg== 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 pc16-20020a17090b3b9000b002262767bde0si16205148pjb.116.2023.01.11.11.57.31; Wed, 11 Jan 2023 11:57: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; 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 S235566AbjAKT5O (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234746AbjAKT5B (ORCPT ); Wed, 11 Jan 2023 14:57:01 -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 BCB12E020 for ; Wed, 11 Jan 2023 11:56:59 -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 1pFhDR-0005F2-DZ; Wed, 11 Jan 2023 20:56:53 +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 02/20] staging: r8188eu: remove io function prototypes Date: Wed, 11 Jan 2023 20:56:22 +0100 Message-Id: <20230111195640.306748-3-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?1754757399743346887?= X-GMAIL-MSGID: =?utf-8?q?1754757399743346887?= Remove some prototypes for io functions which are not present in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index c15b2e873fd5..18e95bccda49 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -203,12 +203,6 @@ struct io_queue { struct intf_hdl intf; }; -uint ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); -void sync_ioreq_enqueue(struct io_req *preq, struct io_queue *ioqueue); -uint sync_ioreq_flush(struct adapter *adapter, struct io_queue *ioqueue); -uint free_ioreq(struct io_req *preq, struct io_queue *pio_queue); -struct io_req *alloc_ioreq(struct io_queue *pio_q); - uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); void unregister_intf_hdl(struct intf_hdl *pintfhdl); @@ -273,11 +267,6 @@ void async_write32(struct adapter *adapter, u32 addr, u32 val, void async_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); void async_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -uint alloc_io_queue(struct adapter *adapter); -void free_io_queue(struct adapter *adapter); -void async_bus_io(struct io_queue *pio_q); -void bus_sync_io(struct io_queue *pio_q); -u32 _ioreq2rwmem(struct io_queue *pio_q); void dev_power_down(struct adapter *Adapter, u8 bpwrup); #endif /* _RTL8711_IO_H_ */ From patchwork Wed Jan 11 19:56:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42163 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3508956wrt; Wed, 11 Jan 2023 11:57:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXuTQU6Va51zH9bWhenw9zZnl00ZZZ2PnW56gTksqTBi50NYxvraTJfztlqFz2Zrq8U05zQK X-Received: by 2002:a17:90a:28c4:b0:219:158d:61c2 with SMTP id f62-20020a17090a28c400b00219158d61c2mr76430575pjd.19.1673467070013; Wed, 11 Jan 2023 11:57:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467069; cv=none; d=google.com; s=arc-20160816; b=hoF+T8eFYH4o+ywiI5Ef0X/QXZ5moopTh4ECTjn+B3F/eg7BsiE/Xtv33RSl1VFWdB N53sREPlQV/OuzlHgQCK0/+skmTzgGXP81oh2LWcDk8O6lI+tzW+oRW1DyQ7IepBXZZU CCf/uMO/4UFzDKztIKzxt8kAF3n3VasTPmnPnJsFi8jTcsWztnOgpU3JbkrDTdKdfDdF +3KK+x7gxbP6n+DNOeKRZEU3pxnOzUiY+tiMjLigFFZP1jJD4pSSl/7MTrCTL/JPuFWX kUwPJAPTWdqTCOVwSupe0HIE+tSfMG0dqWVE0vyjwZQHB/5b7M1mWQcOdnkSq8KcWZqr 88gQ== 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=ueY5FU6qPARMxL12aNfuSbqydyMQjSFOFrehpVC4qwg=; b=eRvqcE+A3iLx60RVR54ub2/Piy45mUQ9xHLX88C9pcyuXkPjOsxPalJ8V7xH1MLrHk EyTNRDoq4nJKZujgMewA24FZuIVrfNY3p0Vz+JnEC876INLvyKYnjoyTxUtA5LlO0e0G FyC8ibP32sO/BFxvJajDU9odrARhmsTpDHBBUBOdhCKmVmNjKkG3mf8G5tu2qATAmhLu b97wZaRN+q3oqr7xH9KHfsRjPLLiulxa/9jylQ4dUXflDuAwxi2UpeQSVrbU3oJ21TkC ZXfzHZ7tutqymiGkUgZDp0oez1CpdW/3kR3W04agfsBisFXOpEzIJLOmAIpP8Oy+yuIN zMxw== 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 x3-20020a17090a8a8300b002265fe84432si14883594pjn.44.2023.01.11.11.57.37; Wed, 11 Jan 2023 11:57:49 -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 S235946AbjAKT5V (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234769AbjAKT5B (ORCPT ); Wed, 11 Jan 2023 14:57:01 -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 40BD9183AA for ; Wed, 11 Jan 2023 11:57:00 -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 1pFhDS-0005F2-6H; Wed, 11 Jan 2023 20:56:54 +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/20] staging: r8188eu: remove ioreq function prototypes Date: Wed, 11 Jan 2023 20:56:23 +0100 Message-Id: <20230111195640.306748-4-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?1754757406350873684?= X-GMAIL-MSGID: =?utf-8?q?1754757406350873684?= Remove some prototypes for ioreq functions which are not present in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 18e95bccda49..1d65c60cbe27 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -227,14 +227,6 @@ void rtw_write_port_cancel(struct adapter *adapter); void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem); -/* ioreq */ -void ioreq_read8(struct adapter *adapter, u32 addr, u8 *pval); -void ioreq_read16(struct adapter *adapter, u32 addr, u16 *pval); -void ioreq_read32(struct adapter *adapter, u32 addr, u32 *pval); -void ioreq_write8(struct adapter *adapter, u32 addr, u8 val); -void ioreq_write16(struct adapter *adapter, u32 addr, u16 val); -void ioreq_write32(struct adapter *adapter, u32 addr, u32 val); - uint async_read8(struct adapter *adapter, u32 addr, u8 *pbuff, void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, From patchwork Wed Jan 11 19:56:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42164 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3508988wrt; Wed, 11 Jan 2023 11:57:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXtp9NprJcAO0UNtpv10OE+59AtgEhc4WbyhAYO7x9g+Tbuzk+olkR5jYTRacdEyI1/Xptyw X-Received: by 2002:a17:903:24b:b0:187:282d:6990 with SMTP id j11-20020a170903024b00b00187282d6990mr61857379plh.28.1673467074184; Wed, 11 Jan 2023 11:57:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467074; cv=none; d=google.com; s=arc-20160816; b=gjM0Nx6kUiBVKVWJnmJL3BmIMHTs3ZTTD4PnoJXPcMxOdfB0agjcIxXCJP1ZXGJhd5 12b8Zg7XxZ9PFHigKEkufOPtBkLvTdRRVaDG5J8tAY+POE4jQBYPANLjenPcl6RR+dUw jXiXY6GMDhUu3Wdf0gGRWsMZlsdel9gEv+qfxH29t7Y2QvlKVxFVRpKLEnyalDWpDl8f lEQ7aZ+qpaAEGXhzPPJh5HqOKHOUqUIo7tBStcstu5JxFBzVQZv+CqVm2BRP+3Elfx0R AGyqvTlOeZ5RN3mQoy0h6TCvBkjK7Fstj/tUKvaQTfs6wFR9GaMckdyp54fyJMGXxWpw NZng== 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=JKvcd8z80UqnJFd8A/1RJz3ethQyeVsCejfgwZmluMs=; b=v4LT37t96oEMvzKsdXmElTbHwm8Jz5YZ5K73pd6AmmVna509UD4shFFrgsAGjllY3K sYoqffZ0ixo/wfIjn72bxCaviWaR2CNLQ99w9Kd0qKb8LzRiP0j50+WR+V/hKsyF3X4B b/AJ/Jj/wOLMhb0XL92skJghQ1jpHyDutnWRqe8geDEseV4nrNck6Cyp8/yhCbfTcobN o7bMzaK81XQtiOynTeoNoX1CuvQkEAk8th9CRUU+g/hFXCFekp4p17OvunIb9dvGtHMV jttElTLzfqCPfhjX0hfRTnMyxi5RLmjqWI8hlwWvJvehy7G4bXz8WpAjtBt8cKp/WEnt xHjA== 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 4-20020a631544000000b00476e62744a8si14617639pgv.388.2023.01.11.11.57.42; Wed, 11 Jan 2023 11:57:54 -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 S239050AbjAKT5Z (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235167AbjAKT5B (ORCPT ); Wed, 11 Jan 2023 14:57:01 -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 B4B95183BE for ; Wed, 11 Jan 2023 11:57:00 -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 1pFhDT-0005F2-QF; Wed, 11 Jan 2023 20:56:56 +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 04/20] staging: r8188eu: remove async read function prototypes Date: Wed, 11 Jan 2023 20:56:24 +0100 Message-Id: <20230111195640.306748-5-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?1754757410725144363?= X-GMAIL-MSGID: =?utf-8?q?1754757410725144363?= Remove some prototypes for async read functions which are not present in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 1d65c60cbe27..f9394329b674 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -227,22 +227,6 @@ void rtw_write_port_cancel(struct adapter *adapter); void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem); -uint async_read8(struct adapter *adapter, u32 addr, u8 *pbuff, - void (*_async_io_callback)(struct adapter *padater, - struct io_req *pio_req, - u8 *cnxt), u8 *cnxt); -uint async_read16(struct adapter *adapter, u32 addr, u8 *pbuff, - void (*_async_io_callback)(struct adapter *padater, - struct io_req *pio_req, - u8 *cnxt), u8 *cnxt); -uint async_read32(struct adapter *adapter, u32 addr, u8 *pbuff, - void (*_async_io_callback)(struct adapter *padater, - struct io_req *pio_req, - u8 *cnxt), u8 *cnxt); - -void async_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -void async_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); - void async_write8(struct adapter *adapter, u32 addr, u8 val, void (*_async_io_callback)(struct adapter *padater, struct io_req *pio_req, From patchwork Wed Jan 11 19:56:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42168 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509170wrt; Wed, 11 Jan 2023 11:58:20 -0800 (PST) X-Google-Smtp-Source: AMrXdXu2bXd0XebqXtfZoneK19HeGBIIXxmzWAmdcOnFNqzZShn7QMGzJ1iXbv/gBv8CBlmXRwPc X-Received: by 2002:a17:902:e744:b0:194:45ed:2a6a with SMTP id p4-20020a170902e74400b0019445ed2a6amr7454264plf.67.1673467100052; Wed, 11 Jan 2023 11:58:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467100; cv=none; d=google.com; s=arc-20160816; b=q+2zFAiCMeP27mT6E6UymdNOPI3F/qWljNWHye8SseNLnCyWOEVncSiuqMIKg/zPcb y8HZ10THjQqzw6doHVa+1GTH8tDozB6+qBw78Vjn0Yw2bYhbP+uN1FdTeeAfRuq5FY3X jOvGZjzmEs0nBcWnB1KJXxnbJb+7o02EEWCue0ScIXWs9XJQlr6fvm0mC+OFGI3QTBLQ XHOk0DpJTFnxUgfJH5XS3MqrHPeq8cW9LXTBAdcL1tjdac0nfKVi7AXSeyMYWeWKNSzi tgYxVlSFwoQefyUwBfRm/iCtp4Wwy+P2cwIDKWLS6pofZYu2ZkiRKKxJObYf1Yw9y5L2 H00g== 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=JIomht/wGGdF2Tnsu4pxvnQsWc1+aQhxBW3b9WL60bY=; b=r1goLXMvgVUEARhXEbPoWPWpM49Cyt9vQvDeYdxDkgbG3F4p0QxC6ksrMuZ1pP35G5 Z2e3WUd/C6RcY6/opckzX0wt0LB5+LB1+CLgsKBEjudC40KOnLVW42aeY/3vU2M0kO2G oTXQETqb9gGgo6blZT284flnCGDl7TRkIWL6oTGwZMYbxvXMeXlA823KBxw1DKQdPN7y YpuzdIPm5BAK1o8rztkw3N6nzMHsggjrComA5sJ+JGp6hnD+kDl5w0BXRGBbth5nQcQA AkPLWmbFgG3kimo4og/1Qc/qBAx3EzvZs6p4P32axTXvuQbLHnGh+0Zlkq7gstMrRAnE dJ0A== 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 d12-20020a170902cecc00b00192833aba9bsi15684080plg.48.2023.01.11.11.58.08; Wed, 11 Jan 2023 11:58:20 -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 S239479AbjAKT5o (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233899AbjAKT5C (ORCPT ); Wed, 11 Jan 2023 14:57:02 -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 DA2832BF for ; Wed, 11 Jan 2023 11:57:01 -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 1pFhDV-0005F2-3Z; Wed, 11 Jan 2023 20:56: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 05/20] staging: r8188eu: remove async write function prototypes Date: Wed, 11 Jan 2023 20:56:25 +0100 Message-Id: <20230111195640.306748-6-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?1754757437666246611?= X-GMAIL-MSGID: =?utf-8?q?1754757437666246611?= Remove some prototypes for async write functions which are not present in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index f9394329b674..6ce099e91e20 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -227,22 +227,6 @@ void rtw_write_port_cancel(struct adapter *adapter); void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem); -void async_write8(struct adapter *adapter, u32 addr, u8 val, - void (*_async_io_callback)(struct adapter *padater, - struct io_req *pio_req, - u8 *cnxt), u8 *cnxt); -void async_write16(struct adapter *adapter, u32 addr, u16 val, - void (*_async_io_callback)(struct adapter *padater, - struct io_req *pio_req, - u8 *cnxt), u8 *cnxt); -void async_write32(struct adapter *adapter, u32 addr, u32 val, - void (*_async_io_callback)(struct adapter *padater, - struct io_req *pio_req, - u8 *cnxt), u8 *cnxt); - -void async_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -void async_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); - void dev_power_down(struct adapter *Adapter, u8 bpwrup); #endif /* _RTL8711_IO_H_ */ From patchwork Wed Jan 11 19:56:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509124wrt; Wed, 11 Jan 2023 11:58:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXtH0Cktk6HXurZWgWut3lCACeIKAT6KTFjBIYMrcaKZD/K5G6WvaiI19jDT4MD2C2HGwMGh X-Received: by 2002:a05:6a20:4f26:b0:b6:5bde:3064 with SMTP id gi38-20020a056a204f2600b000b65bde3064mr2131402pzb.16.1673467092688; Wed, 11 Jan 2023 11:58:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467092; cv=none; d=google.com; s=arc-20160816; b=A5yTSsDivoYMnrTgzYpG8nIy/z09eVt3mRZV2aU4/bFx1o8k8j0lfjY9EsOIQJYKUI 8Yx6pH2j4NtkHe5H/ZpszTTFgTsOzNqPhSXEPlihsJAbZC62+S8hbisSmQN+9OQwdkgY 5S2D9PnAAUq0208S6utDNPGTkwvdF0K7IPgi9BpifiIXWjVEhvfwDbM6uCFeyPo3S8Zc 9txLxDxY36pQgHfg93K1m+qpx8ahvfRF6A8tudq8Bt+UbyLFp3asNVWjFrNPcAwmCIL1 D0hJOjf+z8Ulf3I9skyqrDcWYwUHV91W0BCSnJB22OCCk52w40qWAC6l92wtowcc42du tYvg== 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=10c9fxlhmmuaW3xxqHH313/Gqv6PAYuVacC3RG7PG14=; b=V/UdFIzPCK0tjclqne21AcXZLLyJaF0wXVfhG1szx0ZqDG9W1iKmIP0CX7f3g4KJ+p 9SuCyt5Z7PNjQcExG0Ql222RdNF83IZVU9QGEaf3w9rbrnXr/1r+DarfJZwqirKenjhb oXhi0lecLiOCbnLL/UAMfOpOThX1O6nnfyKN18frdJNoVE8OssRJdW82l/kTvi9m9+za Hnhs6P9c3CaHMtMjIstqR3NuBlIVpvAOX2v8ejve0e1kdHxij6bAAzhKvKcJc7hPXP5s 7DbvXbQWwGOlByZ03W69ldc6bljm6wfBsVt0ET5gxfgRaMqlK7FuB5Bm5B+lMP51pVz1 r0Qw== 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-20020a631258000000b0048be2671cd0si10195814pgs.170.2023.01.11.11.58.00; Wed, 11 Jan 2023 11:58:12 -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 S239348AbjAKT5k (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234409AbjAKT5F (ORCPT ); Wed, 11 Jan 2023 14:57:05 -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 2A287BA5 for ; Wed, 11 Jan 2023 11:57:04 -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 1pFhDV-0005F2-Tu; Wed, 11 Jan 2023 20:56: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 06/20] staging: r8188eu: remove struct io_queue Date: Wed, 11 Jan 2023 20:56:26 +0100 Message-Id: <20230111195640.306748-7-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?1754757430146361480?= X-GMAIL-MSGID: =?utf-8?q?1754757430146361480?= struct io_queue is not used in the r8188eu driver. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 6ce099e91e20..7d1f3cc20b57 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -82,7 +82,6 @@ struct intf_priv; struct intf_hdl; -struct io_queue; struct io_req { struct list_head list; @@ -188,21 +187,6 @@ struct reg_protocol_wt { #endif }; -/* -Below is the data structure used by _io_handler -*/ - -struct io_queue { - spinlock_t lock; - struct list_head free_ioreqs; - struct list_head pending; /* The io_req list that will be served - * in the single protocol read/write.*/ - struct list_head processing; - u8 *free_ioreqs_buf; /* 4-byte aligned */ - u8 *pallocated_free_ioreqs_buf; - struct intf_hdl intf; -}; - uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); void unregister_intf_hdl(struct intf_hdl *pintfhdl); From patchwork Wed Jan 11 19:56:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42169 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509238wrt; Wed, 11 Jan 2023 11:58:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXuFVC38+UDCRKhc0mQa29bOT9EJ3RW5flqr4yiyhFm9jA4ZjfRBSuijHpTGaTm6dL+skJgS X-Received: by 2002:a17:90b:94c:b0:228:d1d5:5468 with SMTP id dw12-20020a17090b094c00b00228d1d55468mr6730825pjb.25.1673467107777; Wed, 11 Jan 2023 11:58:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467107; cv=none; d=google.com; s=arc-20160816; b=0+yyj56SPm5oyw74FpfAoXG+D+0t6ZSXHY8tsbKCzTCpu+dTcZ/ATgUa1piBwT+KeZ X/lYO6e4RrnQl6v6r1nfutw4DOfA3eAC9FvwQKPk/WP0xN1sunKGzWnqvkEbtJcW7GUa pJUawjRZe6657Sh6bSws39I2M+IwA59G6cgRKW5+ZV7qUwPj2DE4VA4nsRRft0rD8XsU liuWWv6r9HP/am01jwvkrdmvFwsCIIXHlSG8Q3nZqG5leVX3J+GmMOf59AiVTEtgWw7o sY8DHl7YdawDWQcdX3rkcqvxEDfdkM5t3P5ANTxnyk8tgPzEEQs1yDKs6GOJdxLNdhd/ 6EQA== 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=8vI3yCOU1lhLeI4e4r28PvdzZAd7jthMEFxR5hnshGo=; b=GiIWSwmEhDZGsllwhHUXWMs4LM9rG5+E3G/gftHEJ8R2vuWbMJeHaIZkO44n/szrzo X+2JeBwNvvE1YytImsGlLkPwsobQVXeuQ1hE6ihi1rVhB985lZslL6nl+2NN3UaZqUNW 3P7nbeZkd0JdYkX20LNjZpSqAhypt0KSBZT9BnTXkv8B+2pND+lfTnT1/k6x9R6Uqd8W 44NDt+aDpKpVfF/univDqjJp4KdlBMw/JHGET8qdLOImU1IwwODkdPq2Z+kpvXtb7H9h UB0zz7ea3ajbHnYHedO2WsWK+itqbz+qyiKT1QCUuyR1X7DF+Y3I2srvoI9pLnNxGXQh dhPQ== 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 k14-20020a17090a590e00b002262f38c314si14203648pji.120.2023.01.11.11.58.16; Wed, 11 Jan 2023 11:58:27 -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 S239549AbjAKT5r (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232580AbjAKT5D (ORCPT ); Wed, 11 Jan 2023 14:57: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 3DCFBB73 for ; Wed, 11 Jan 2023 11:57:03 -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 1pFhDW-0005F2-NW; Wed, 11 Jan 2023 20:56:58 +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 07/20] staging: r8188eu: remove attrib function prototypes Date: Wed, 11 Jan 2023 20:56:27 +0100 Message-Id: <20230111195640.306748-8-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?1754757445706808483?= X-GMAIL-MSGID: =?utf-8?q?1754757445706808483?= Remove the prototypes for attrib read and write functions which are not present in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 7d1f3cc20b57..9cf4f233ae60 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -190,9 +190,6 @@ struct reg_protocol_wt { uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); void unregister_intf_hdl(struct intf_hdl *pintfhdl); -void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); -void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); - int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data); int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data); int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data); From patchwork Wed Jan 11 19:56:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42165 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509098wrt; Wed, 11 Jan 2023 11:58:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXuw+9h+c7WBFd9IAsAqt1d4UV6NS1cv6nq5+2P7DYE+qmb4ghb1ogWBzeachJ4i3gxC2mYz X-Received: by 2002:a17:906:dff5:b0:7ef:b60e:cb02 with SMTP id lc21-20020a170906dff500b007efb60ecb02mr63427307ejc.48.1673467089458; Wed, 11 Jan 2023 11:58:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467089; cv=none; d=google.com; s=arc-20160816; b=Jz1BdmlW/uJqoFLRd9ncv1tnU4p9C2J64SYDUqk1uC53mmLzb5PGtzVZpuPcGbsWKO 5NbyWM9Wnrnuj5LVKHwoh1q/MH5gd7y9zGdTvMDQk7ah7Lhmv+DgQiOXxkwPWpwG217s zhlLpFF/ixJ3S5X7dsOLW2tNtCmRXgtqWGBLLAxHBHBYRA1xsu0Arg1VGSYxaMv1uKC+ vMolHBsNVNJqfcldIDn9nKjPyBoSsEkcysMn1ewQVIfFapSSEW5BV4SY3wU1HYPmbjVS HIQh1i/t67n58vnKh1IISCEtTImxh9dHmPg6Z5OnjSvxjd/gMbvEiIq4lj1lDcSUfS48 R5xw== 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=SdXpg/VWtPNQFBEL5yQ4QL6N7kngspksxiBKUviAUO0=; b=JN8kVzHOfTQdDMQL3QlBXZko49tl9t6rkzYGUJk67TcxpduGhlTx4ou6JyNTBCgEym 5458WBnV2EeVi8r8ZSYdlfJrXrasYOBN5nW6OPwEV2rk7gaSd3XrvODz1/06yPR1PkHW dDcrjxCrZdzRVmLXa3SrusY0s0MUFEFYUgd+ymbWT2HljGLgcisk2WjWCzpMF/rDwIBn P2XR/sDL83OTSCKsi1EX13j7JkSKfiTeddfxHBYwchZFAPBRGyDE6owsHTFFcdx4D3IS 2LY4vsr5w5jYFwxk3HtTd5JU/pphRTKTDeawiUbxNIZjzY3UXUVZ3B6ZnTVpNu8dGSqd j5OA== 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 hp16-20020a1709073e1000b0084d2239b497si16578769ejc.192.2023.01.11.11.57.45; Wed, 11 Jan 2023 11:58:09 -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 S238964AbjAKT5b (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234039AbjAKT5E (ORCPT ); Wed, 11 Jan 2023 14:57:04 -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 EDB71302 for ; Wed, 11 Jan 2023 11:57:03 -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 1pFhDX-0005F2-GP; Wed, 11 Jan 2023 20:56:59 +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 08/20] staging: r8188eu: remove rtw_write_scsi function prototype Date: Wed, 11 Jan 2023 20:56:28 +0100 Message-Id: <20230111195640.306748-9-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?1754757427176269289?= X-GMAIL-MSGID: =?utf-8?q?1754757427176269289?= The rtw_write_scsi function is not present in the r8188eu driver. Remove its prototype. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 9cf4f233ae60..7c4fe273cc0d 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -206,8 +206,6 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); void rtw_write_port_cancel(struct adapter *adapter); -void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem); - void dev_power_down(struct adapter *Adapter, u8 bpwrup); #endif /* _RTL8711_IO_H_ */ From patchwork Wed Jan 11 19:56:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42166 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509088wrt; Wed, 11 Jan 2023 11:58:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXufnUCnkiXynpNHPWv3yDHufblSsBzHU4ajc3TRJ5L26rymd1nffg3S53jg2cTigXl8Yr4G X-Received: by 2002:a17:90b:3945:b0:228:cb86:1f77 with SMTP id oe5-20020a17090b394500b00228cb861f77mr7217021pjb.35.1673467088804; Wed, 11 Jan 2023 11:58:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467088; cv=none; d=google.com; s=arc-20160816; b=VAbSYJL0/XMOwZ6tw/cQ/+J6wctmGt0nFX/naK3KPtlXNI5LgScTPSb7QmR3JonkT9 2/rcHZN+kRB2SnO0avuZAgcDOgznOrAFlCzuL+auDrmtnzv9VKMNAFk47PB8rlPBnXTi YcyHAJqZFF3KhIfPRc8W63QqViL8D0D/w2udupSKLP1gXOZJdD98aGWZ6mOh+RR9xNAa A2CN6zshIETctBgqGUE15nO6irh0YpW1F97evtuyCLA1mpLBgJ+wNRfLrbMnd7KhP9z+ Rm0lIcEJ2IQY+0tnpav6BcvQwuE8L3OXYjbQzKJWoeRmrdSm0jj4oiRAvl4dom5N8wJZ kJuw== 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=/2/u3ccUbBaWxZR2tvQuxzlbdyIyLCSVLq1dVTryYBU=; b=WqFbJGw9nCvyelqMrCHvP/RySvImKpeBzskwYaPfwJoHHEZp8cN/caUtRPXjSYXzBn McndXNW4S92EYmo7FxWatrllhJ1MFWSsZk+ry692RzVj9jNP3VV2rlLHAi6bi1B2XRcx WZBDCH5Lr5361GJAYyg754ew9qqZCE8q2TS4rA+OAC3hZh4iJ7KTnX0g8RKoRtgsx2Pi C53V7zDbL7nMvsvFxSnQMyPb94t4L9U93C61izfUy3B6pdQvQ0wNza7u7Mb8YHCikU29 RjK5okJiGXIs3mXsD7xBkbrFS3gLT5wdIHMVHIpNEJEfWxsTmtSekAcIIheh/4sHjYaU V8ZA== 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 n7-20020a17090a9f0700b00219a2721d64si14254236pjp.72.2023.01.11.11.57.56; Wed, 11 Jan 2023 11:58: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 S239204AbjAKT5h (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232344AbjAKT5F (ORCPT ); Wed, 11 Jan 2023 14:57:05 -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 48080BB7 for ; Wed, 11 Jan 2023 11:57:05 -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 1pFhDY-0005F2-8f; Wed, 11 Jan 2023 20:57:00 +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 09/20] staging: r8188eu: remove dev_power_down function prototype Date: Wed, 11 Jan 2023 20:56:29 +0100 Message-Id: <20230111195640.306748-10-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=-0.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,TVD_SUBJ_WIPE_DEBT autolearn=no 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?1754757426081400946?= X-GMAIL-MSGID: =?utf-8?q?1754757426081400946?= The dev_power_down function is not present in the r8188eu driver. Remove its prototype. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 7c4fe273cc0d..4800c8249721 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -206,6 +206,4 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); void rtw_write_port_cancel(struct adapter *adapter); -void dev_power_down(struct adapter *Adapter, u8 bpwrup); - #endif /* _RTL8711_IO_H_ */ From patchwork Wed Jan 11 19:56:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509356wrt; Wed, 11 Jan 2023 11:58:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXsc7hgIQDNCD65c8hMJ9+GFjuZqVwW8KU9egnReneFxH0rise7exWclKBmcaUl/d8NUZWkf X-Received: by 2002:a17:906:5202:b0:7c1:4a3:10b6 with SMTP id g2-20020a170906520200b007c104a310b6mr61373301ejm.53.1673467128134; Wed, 11 Jan 2023 11:58:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467128; cv=none; d=google.com; s=arc-20160816; b=B+oxhBVs/9e/kBkVBzfEIaKoNloouSS4V2NdATiKL2q1rVOmtB6f2/smoN91jAiSuI wiWw7KxJeQ761c3RAi6gQO2GGVI8C42sbUZ2s+zY6a19WkBWSePM/+/mH7WZPJElkIAK 0/JAVI9spi4++AiXe52lUKFvO5INjt/GupjRMaawmwFlWnKObNdK7FyQAYJp9DN81Q6R qXlAPnxIlVpVpi7GmKg9GP2MVNOgMsvQmmkQ5bCK/YChG8P0SdyoB/+7Wsvk0wkuQQst kufrgMppmlcEEwhTDYAfHxaZ9lI86a6o1dD576eh2rE1sGzF0xI+VPYXS6vNLVgYKGHs axUw== 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=Yt3kaWkUYhvjNg2TeovCzRS+m8mWGuA8jBlGPWP23LM=; b=ulsSamwi8dMI+m/UyZKxRZ7YqIb3c9Z34U4QGX0gBhlRAN++FQ5rP62bGUdIslEv8r xh2PQH0RNXwc0wcDfIvvEfE76b9Mu7XF86UWHtWSlblFWR2iPEgxiOympjXnWMbH4U+p uMJDNjRiT7TcHlsbm/CZOa+mCEiv61440iZXiUWMYN/LdJcepQo3IpBbxpKnAXe2QVJQ GYjwTqp7hd+E4IMf9YIunESp4ZBw6kXXQFc4ISLGGPTdZ5xx1pHq6dH+9weXV5LjP3tH FsU7JzH662YEw/ZUNDUW5nVz5eN7yhZ8CAjb3JLTpsQyP/opqMlVriyy52ERJtDCH13K MIug== 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 ww2-20020a170907084200b007c163a17f44si16015188ejb.995.2023.01.11.11.58.23; Wed, 11 Jan 2023 11:58:48 -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 S234808AbjAKT54 (ORCPT + 99 others); Wed, 11 Jan 2023 14:57:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234959AbjAKT5G (ORCPT ); Wed, 11 Jan 2023 14:57:06 -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 CC085D6B for ; Wed, 11 Jan 2023 11:57:05 -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 1pFhDZ-0005F2-0e; Wed, 11 Jan 2023 20:57:01 +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 10/20] staging: r8188eu: remove struct reg_protocol_rd Date: Wed, 11 Jan 2023 20:56:30 +0100 Message-Id: <20230111195640.306748-11-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?1754757467116079731?= X-GMAIL-MSGID: =?utf-8?q?1754757467116079731?= Remove struct reg_protocol_rd. It's not used in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 43 ------------------------ 1 file changed, 43 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 4800c8249721..858fd9cbb57a 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -102,49 +102,6 @@ struct intf_hdl { struct dvobj_priv *pintf_dev; }; -struct reg_protocol_rd { -#ifdef __LITTLE_ENDIAN - /* DW1 */ - u32 NumOfTrans:4; - u32 Reserved1:4; - u32 Reserved2:24; - /* DW2 */ - u32 ByteCount:7; - u32 WriteEnable:1; /* 0:read, 1:write */ - u32 FixOrContinuous:1; /* 0:continuous, 1: Fix */ - u32 BurstMode:1; - u32 Byte1Access:1; - u32 Byte2Access:1; - u32 Byte4Access:1; - u32 Reserved3:3; - u32 Reserved4:16; - /* DW3 */ - u32 BusAddress; - /* DW4 */ - /* u32 Value; */ -#else -/* DW1 */ - u32 Reserved1:4; - u32 NumOfTrans:4; - u32 Reserved2:24; - /* DW2 */ - u32 WriteEnable:1; - u32 ByteCount:7; - u32 Reserved3:3; - u32 Byte4Access:1; - - u32 Byte2Access:1; - u32 Byte1Access:1; - u32 BurstMode:1; - u32 FixOrContinuous:1; - u32 Reserved4:16; - /* DW3 */ - u32 BusAddress; - - /* DW4 */ -#endif -}; - struct reg_protocol_wt { #ifdef __LITTLE_ENDIAN /* DW1 */ From patchwork Wed Jan 11 19:56:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509402wrt; Wed, 11 Jan 2023 11:58:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXs8uv66+iNOOSCjd33uwOic+gNS7Cwpwe4ScXPLbb62V4kQ0fxtd7rmWzyHnLSjnK9qJFXa X-Received: by 2002:aa7:cd6d:0:b0:497:43ec:9e1d with SMTP id ca13-20020aa7cd6d000000b0049743ec9e1dmr16216008edb.0.1673467134725; Wed, 11 Jan 2023 11:58:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467134; cv=none; d=google.com; s=arc-20160816; b=0kZO0SkTxlZdKj3g7vKBMF20gnbEBei7d2bazHllqKDlqg22eEohHw7EmGjU6dIDE0 wXVmPYtE33PM7VPiaIBfQaaWEq7LKaDpOt8BJogvzJfcBLTk6PtF+FApjEPjVFsCph0+ wHCJt1wFmN5z1ixBCA/tOH7E0mnVWKlSmK19xNSMFB7He8N/KTFL5WsNjJi8ikILOYKH kPBGbDvzSGVbCtOx+mkpmHHlTk+dIpkBkTip/FeqXfBEgWhyTlgaBopehffY/+3zuB1+ s62LId8yM+5W38g+g9ufQMrvEfYNghLzO2qpZolNpydZppmF4cDZXjD+X8WDzX+IcdDZ nOwA== 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=ty/z5acew6Mo9CFMfGj4yT/muk8OuhFRIG17pIi5sa8=; b=uFDR8Xg+eVGuh7moLIPB019xwLlBOZ6yqbKbZgdzqQjc78n942dXIWfuUo5WSaOeuQ PwKCrVAG//Ri1xcbh7a67/qjeUcxopecy/19gHE/51d/ep45dN0q9dm5+ATWyRmW182S A6lZn89C3mCwthI5ojXNQqIoLioB/ogCZWXf6qVspBKv8f2brtt/VRbWtwB25VFqNg0e 1Ld4BnULi+L68kPNG3AS+EIAXgTWJadD1e85QG/O22+cLepslmVZLUyWcyhPL6XtH7NA oEpn3eeBA4dYc7gFx1fO4/5gzTmmjdDSYI7AgKtAvbtpHhj8KsSueAbVIZDi/EwgNaXi BgyQ== 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 p13-20020aa7cc8d000000b00457f31c1a10si13895593edt.584.2023.01.11.11.58.29; Wed, 11 Jan 2023 11:58:54 -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 S235754AbjAKT6B (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233532AbjAKT5I (ORCPT ); Wed, 11 Jan 2023 14:57:08 -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 1B4BED93 for ; Wed, 11 Jan 2023 11:57:06 -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 1pFhDZ-0005F2-PV; Wed, 11 Jan 2023 20:57:01 +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 11/20] staging: r8188eu: remove struct reg_protocol_wt Date: Wed, 11 Jan 2023 20:56:31 +0100 Message-Id: <20230111195640.306748-12-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?1754757474210922680?= X-GMAIL-MSGID: =?utf-8?q?1754757474210922680?= Remove struct reg_protocol_wt. It's not used in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 42 ------------------------ 1 file changed, 42 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 858fd9cbb57a..ae290a18e593 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -102,48 +102,6 @@ struct intf_hdl { struct dvobj_priv *pintf_dev; }; -struct reg_protocol_wt { -#ifdef __LITTLE_ENDIAN - /* DW1 */ - u32 NumOfTrans:4; - u32 Reserved1:4; - u32 Reserved2:24; - /* DW2 */ - u32 ByteCount:7; - u32 WriteEnable:1; /* 0:read, 1:write */ - u32 FixOrContinuous:1; /* 0:continuous, 1: Fix */ - u32 BurstMode:1; - u32 Byte1Access:1; - u32 Byte2Access:1; - u32 Byte4Access:1; - u32 Reserved3:3; - u32 Reserved4:16; - /* DW3 */ - u32 BusAddress; - /* DW4 */ - u32 Value; -#else - /* DW1 */ - u32 Reserved1 :4; - u32 NumOfTrans:4; - u32 Reserved2:24; - /* DW2 */ - u32 WriteEnable:1; - u32 ByteCount:7; - u32 Reserved3:3; - u32 Byte4Access:1; - u32 Byte2Access:1; - u32 Byte1Access:1; - u32 BurstMode:1; - u32 FixOrContinuous:1; - u32 Reserved4:16; - /* DW3 */ - u32 BusAddress; - /* DW4 */ - u32 Value; -#endif -}; - uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); void unregister_intf_hdl(struct intf_hdl *pintfhdl); From patchwork Wed Jan 11 19:56:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509423wrt; Wed, 11 Jan 2023 11:58:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWjayaRLIuXUO8JGTE5tzVwOOTgTdtdXD2ZfK3SPxq5fgbbilnQZYgoAgjpzMLY+UUvcba X-Received: by 2002:a17:906:fcc8:b0:863:e38b:5b0a with SMTP id qx8-20020a170906fcc800b00863e38b5b0amr819399ejb.65.1673467139242; Wed, 11 Jan 2023 11:58:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467139; cv=none; d=google.com; s=arc-20160816; b=fRcB+7ifrbS+j5FZfoxDvVfFuxiUnAoxijXzQpxU1HbrPa0G0BpUpyE7XtNJoFkvpP MO2oL1ZY17msPkBXjH166oH37umLzd249wUZm81KxS80bJA82GzoBl+ejslYRIx7UVqd i6eM/hlV72Z7lrH9kU41VHUbcwcgDOE0nEpSHGnl8J2iAZuvv09E60oozE8JbODTiYiD OtV+4IlCoXceQatQwbuzgTcSLjMIT8mEU8zeDckXaCJTmbYGOKyCc0PBn7OSIA8zf8Fw 3SRftknpDjeJp1XHhT5ZeX7kBDXkVbgTJvF9sPBDOGgHrvvh9kEs5MQYPmgdvBAAq1R7 QBrg== 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=yjH/mQ/FeH2J2pJl8q3lV5AJDQgelrSOqI+C7ecaHsM=; b=uCvsmwY5juPySxIn8F8dizF89iV0Pa1jBkfrFs4xFwsfRetCRcyDozagsOrbIX8qZ6 wNnmVN3Az5Up4pCmlc52aisdUxri/AINLqh3e/m8bl9A+GLCXj6tEelIEkqjSTvupO/E 9fD31uLCkiLZNxvGcbohZRMjhBqyypZgpkppwr2Z59MMCtkuYWVGIbkd31PrD68yE44o lslNXZJdAiMJHHNHxdL0U8jHZ90QTlX/SnBFMSgFlq4KIQK5rUqsrH8DHXDaJJGKQxa3 Xwf8CLlgsY5cVqrA1nojXHfxpSnYPofpgS6E9OCCebCRk4dQp5enM7IPsjAW/ZbixbQT JQtA== 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 ne11-20020a1709077b8b00b007ac2daa0b49si5378368ejc.367.2023.01.11.11.58.33; Wed, 11 Jan 2023 11:58:59 -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 S235772AbjAKT6I (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235030AbjAKT5K (ORCPT ); Wed, 11 Jan 2023 14:57:10 -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 326046149 for ; Wed, 11 Jan 2023 11:57:07 -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 1pFhDa-0005F2-KU; Wed, 11 Jan 2023 20:57:02 +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 12/20] staging: r8188eu: remove interface handler prototypes Date: Wed, 11 Jan 2023 20:56:32 +0100 Message-Id: <20230111195640.306748-13-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?1754757478938820944?= X-GMAIL-MSGID: =?utf-8?q?1754757478938820944?= Remove prototypes for interface handler functions. They are not used by the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index ae290a18e593..c9ddba66d852 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -102,9 +102,6 @@ struct intf_hdl { struct dvobj_priv *pintf_dev; }; -uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl); -void unregister_intf_hdl(struct intf_hdl *pintfhdl); - int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data); int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data); int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data); From patchwork Wed Jan 11 19:56:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42175 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3510607wrt; Wed, 11 Jan 2023 12:01:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXs6cm1znGGgdbXifQONx8DnrMX+H5rvhUtgpZ38zLUUil8z0nxdzRxoKe5zUyUJ3kndR86D X-Received: by 2002:a17:907:a70d:b0:7c0:a17c:fe5 with SMTP id vw13-20020a170907a70d00b007c0a17c0fe5mr57968199ejc.44.1673467278076; Wed, 11 Jan 2023 12:01:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467278; cv=none; d=google.com; s=arc-20160816; b=pVlsTg8YDaDws+ZzzNsQlwYUZF7PNGioKzuqZWkRKNsjm7LcFBMdiow5yFK2lk2upx 9a6E6chnCFILUDbDEP/TKUsZxzFNU8DKCd4BLoUvzPHPM+AggmuozM0tth083UUJ1oqP ufy49gVycwqFehJYeasNTLn2imh6gULXSBnXQD4Au4J2iBfkdL5ccScv4jcKnETtD3UG iv7YpYdhF1tVJ0FrOD8X3uF12Dj+QbUTPfy7IugCsvAvayy6/9GRhWY0Uo0teerXVuB9 tp+z2D9Z1RqeBLsHNz4KwoP7vwiUmsibDF+LVjqJpK51rUQTh2eh/myY1vawPipKocIg K7Yw== 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=8s1+5fEKjNqnjMDPj2LpUsFXsG5g0CUNgLkBBR+Sldc=; b=TgHyZ//yYI9ytqM0zNZpBxlfpQYugsqk7M1971WGTH7RaJYkarKk/USGhcu8qOt5ZD DTOXTp1B8Nzf0t0TVhSjICmTqwvtLDHtdeIs2tzv4nEt+b8QEByBfA2w5NxDBsxAJRm5 aC1UhxBe1MOSbV/zaYAkocBxF12jxPIJwaWRbyrzXgh/Kv6kZnIYPr3eaDfqR08sn76D AJVGye3dbeHUItt/WqkW4W1gV+IwQvo3F6MkSRztPIfKbjibuFhK1B2HwBykXmdUJAez 3zz4PkuAjiZP44YZdA2eVceZ8YxYJdfX7Tr2coPCUuUbpDaNJu8ZYMr4VpD3mwhru1tR Xk3g== 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 ds16-20020a170907725000b0084d4e0424fbsi8210106ejc.340.2023.01.11.12.00.54; Wed, 11 Jan 2023 12:01: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; 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 S236094AbjAKT63 (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235265AbjAKT5K (ORCPT ); Wed, 11 Jan 2023 14:57:10 -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 609F22BE6 for ; Wed, 11 Jan 2023 11:57:09 -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 1pFhDb-0005F2-Da; Wed, 11 Jan 2023 20:57:03 +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 13/20] staging: r8188eu: remove readmem and writemem prototypes Date: Wed, 11 Jan 2023 20:56:33 +0100 Message-Id: <20230111195640.306748-14-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?1754757624443940063?= X-GMAIL-MSGID: =?utf-8?q?1754757624443940063?= Remove the prototypes for the unused _rtw_read_mem and _rtw_write_mem functions. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index c9ddba66d852..95dd66c0be82 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -105,7 +105,6 @@ struct intf_hdl { int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data); int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data); int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data); -void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); u32 rtw_read_port(struct adapter *adapter, u8 *pmem); void rtw_read_port_cancel(struct adapter *adapter); @@ -114,7 +113,6 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val); int rtw_write32(struct adapter *adapter, u32 addr, u32 val); int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata); -void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); u32 rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem); void rtw_write_port_cancel(struct adapter *adapter); From patchwork Wed Jan 11 19:56:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42173 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3509729wrt; Wed, 11 Jan 2023 11:59:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXu0Fi8v9QTPIzvRXzdciNoXraKfFvOg6svfErvimRHSYESXl+Zaa7Xgo4P/w2UrdPFZAIkv X-Received: by 2002:a05:6402:3718:b0:499:a82a:f5ed with SMTP id ek24-20020a056402371800b00499a82af5edmr12893037edb.38.1673467188169; Wed, 11 Jan 2023 11:59:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467188; cv=none; d=google.com; s=arc-20160816; b=k3Uf/QpI2lWX/t5b9+aT1ztTBkTsFT984XoiMRqnRGvP904ike7B6srXw608g1IgGF OsItAU/LVI1fLBWsWEGzN/PxqluPYrcSHyahkkSE00gfx6SwtjCbvQwJ8lodPFWyfDiB 3IztCc+M3JeEEcw9Sukmvb5kDP2L7hrj+Oa3g/wCPrdNcGtFnj/CvmdhoB2T3iKo26S1 /5BY37t1oEKQkhOubEbbW2FgbKg4H5UZYB4eWwruxof5sW/QtVUa135jscuYMQ3977Sm 9QPYQabKikGSwNB1twD7Ul3/oH5DNOcAyjBIRT95smHDJHH4R9xOG0lYgfQr74wr8Q61 M8yw== 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=1tzV8yWh7x9cYqXB9sUzST/ytWWx4N/SlJV+7QERGnI=; b=abPwqIHVvIRyCMNUm9NLqS+SnpILoCTIKWg1L7bCzuUT3jLEDUNHdVl1F0Cd/5GgXI k2IdV8vN2SuGmNRbQzGjc5gLJk6h6gZoYJJgcqjtdSA5oiQ2NA6K8ABRUwLfylv9Bjnt 3+5OULhAU5Sr6fFe/KaD9CIgfNFNXEQrOgyro6Dgl5HKlgB+OoEvmfytKp9voBgfTwS8 IBHXJkfmsDL5WqJRpXm32S1Cz877tmWLZ4BzZR1J278Pd9srFXRFCq/y0BK5mzt1XSVh 9N8Zk59CvrBikVfyd820eYY09wg17IOrxfo7rFPdBMw0ANEL5QxpR1DUvuaOl/EnJgWJ vbRg== 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 s6-20020a056402520600b00493952a2f8esi4954228edd.269.2023.01.11.11.59.24; Wed, 11 Jan 2023 11:59:48 -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 S239619AbjAKT6R (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235180AbjAKT5K (ORCPT ); Wed, 11 Jan 2023 14:57:10 -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 C22AB6174 for ; Wed, 11 Jan 2023 11:57:08 -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 1pFhDc-0005F2-5s; Wed, 11 Jan 2023 20:57:04 +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 14/20] staging: r8188eu: remove IO defines Date: Wed, 11 Jan 2023 20:56:34 +0100 Message-Id: <20230111195640.306748-15-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?1754757530147074269?= X-GMAIL-MSGID: =?utf-8?q?1754757530147074269?= Remove a couple of IO related defines which are not used in the r8188eu driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 58 ------------------------ 1 file changed, 58 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 95dd66c0be82..749bb1d0eeed 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -22,64 +22,6 @@ #define rtw_usb_buffer_free(dev, size, addr, dma) \ usb_free_coherent((dev), (size), (addr), (dma)) -#define NUM_IOREQ 8 - -#define MAX_PROT_SZ (64-16) - -#define _IOREADY 0 -#define _IO_WAIT_COMPLETE 1 -#define _IO_WAIT_RSP 2 - -/* IO COMMAND TYPE */ -#define _IOSZ_MASK_ (0x7F) -#define _IO_WRITE_ BIT(7) -#define _IO_FIXED_ BIT(8) -#define _IO_BURST_ BIT(9) -#define _IO_BYTE_ BIT(10) -#define _IO_HW_ BIT(11) -#define _IO_WORD_ BIT(12) -#define _IO_SYNC_ BIT(13) -#define _IO_CMDMASK_ (0x1F80) - -/* - For prompt mode accessing, caller shall free io_req - Otherwise, io_handler will free io_req -*/ - -/* IO STATUS TYPE */ -#define _IO_ERR_ BIT(2) -#define _IO_SUCCESS_ BIT(1) -#define _IO_DONE_ BIT(0) - -#define IO_RD32 (_IO_SYNC_ | _IO_WORD_) -#define IO_RD16 (_IO_SYNC_ | _IO_HW_) -#define IO_RD8 (_IO_SYNC_ | _IO_BYTE_) - -#define IO_RD32_ASYNC (_IO_WORD_) -#define IO_RD16_ASYNC (_IO_HW_) -#define IO_RD8_ASYNC (_IO_BYTE_) - -#define IO_WR32 (_IO_WRITE_ | _IO_SYNC_ | _IO_WORD_) -#define IO_WR16 (_IO_WRITE_ | _IO_SYNC_ | _IO_HW_) -#define IO_WR8 (_IO_WRITE_ | _IO_SYNC_ | _IO_BYTE_) - -#define IO_WR32_ASYNC (_IO_WRITE_ | _IO_WORD_) -#define IO_WR16_ASYNC (_IO_WRITE_ | _IO_HW_) -#define IO_WR8_ASYNC (_IO_WRITE_ | _IO_BYTE_) - -/* - Only Sync. burst accessing is provided. -*/ - -#define IO_WR_BURST(x) \ - (_IO_WRITE_ | _IO_SYNC_ | _IO_BURST_ | ((x) & _IOSZ_MASK_)) -#define IO_RD_BURST(x) \ - (_IO_SYNC_ | _IO_BURST_ | ((x) & _IOSZ_MASK_)) - -/* below is for the intf_option bit defition... */ - -#define _INTF_ASYNC_ BIT(0) /* support async io */ - struct intf_priv; struct intf_hdl; From patchwork Wed Jan 11 19:56:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42176 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3510639wrt; Wed, 11 Jan 2023 12:01:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXuj2cAxMAkz6vgMrm3oXntuZthSke/pgQhvE64ulg1pZoe6MnkY+u6/60a+IlSCHhNTF2rN X-Received: by 2002:a17:907:6292:b0:846:56fe:6c68 with SMTP id nd18-20020a170907629200b0084656fe6c68mr71218246ejc.21.1673467281005; Wed, 11 Jan 2023 12:01:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467280; cv=none; d=google.com; s=arc-20160816; b=dlC85lI1FLiqBlHHo5OaRN93Xt1zX32BVKyZHVvsSCU2EExP8YC+MOPaTZGlaSESRk B6AdIR/jr2KUT+fIrhow9Vct4kskaeys+h5WnqUMuxQu3DW76VDsIf5fwp/cZA+EFjEI cXlCIQFdzEHE/ir2wrXzm/yG9dvDCND+A5HbcHvfqnRUwukuCk/B8SSoS4nfdj1aRm5p wNcOnYYyNbuSKsOLwTsCwpIyq4gXU65y/8xS0dkvtVgi4eok6eYlJHkG2Dx/Dy8yieyx Lb2Zp6H4DD2rfuQq6+MPj+GS6IFHrL9TlnWYM8omjIZithIzlYGpfZ/+j8T4LEmcm5r4 oPTg== 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=HBwYZxwvbdSaY2c/WGmCKyAjLImhTT6hLYxxBsWqjuA=; b=Vmy8+C+Fs0a4DvXSBdRuTSEz9Udwz7vi1VCWncpM+7L6HHjHvcLZexSrNK9xcOl6tF IycazCWCRTJnQZr4t5O75qizNddTEiHsxrqtIOge++O8X95PKfbqb/sD1PsiauXUpsgS H8dWSkY2/LkSmoBtKU33kOf4lCzy57hBpjiWUkQXsB7i0HhoDWOn8rY6CQ1l7nfp6iPS J8CuWeMZaXTIVfl2L6gLfDO+5ZvhW0TWF3aqvBwsDopr+joe+UysNxw2JHoMvnPxfnk0 5YpfRERQlZ/X+7oiVuPuVyAoYqRCNWe3oXYCW+cP2VhnogIYiQBPkR2AClZIHFX9hEgL yfbg== 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 ho9-20020a1709070e8900b0085e1ed3bd2fsi3807199ejc.357.2023.01.11.12.00.57; Wed, 11 Jan 2023 12:01:20 -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 S239641AbjAKT6d (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235290AbjAKT5K (ORCPT ); Wed, 11 Jan 2023 14:57:10 -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 08EFD178BD for ; Wed, 11 Jan 2023 11:57:09 -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 1pFhDd-0005F2-0I; Wed, 11 Jan 2023 20:57:05 +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 15/20] staging: r8188eu: remove struct io_req Date: Wed, 11 Jan 2023 20:56:35 +0100 Message-Id: <20230111195640.306748-16-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?1754757627584680859?= X-GMAIL-MSGID: =?utf-8?q?1754757627584680859?= struct io_req is not needed in the r8188eu driver. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 749bb1d0eeed..900ed2c648d4 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -25,20 +25,6 @@ struct intf_priv; struct intf_hdl; -struct io_req { - struct list_head list; - u32 addr; - u32 val; - u32 command; - u32 status; - u8 *pbuf; - struct semaphore sema; - - void (*_async_io_callback)(struct adapter *padater, - struct io_req *pio_req, u8 *cnxt); - u8 *cnxt; -}; - struct intf_hdl { struct adapter *padapter; struct dvobj_priv *pintf_dev; From patchwork Wed Jan 11 19:56:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42174 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3510400wrt; Wed, 11 Jan 2023 12:00:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXsOYPHbp9HZ4zfDq1sqPjPwLPb4yx7sxyVA9H/ltXLjtDfMiMdL0ZR5byqDki14nif3crna X-Received: by 2002:a17:907:6d26:b0:857:b916:94c1 with SMTP id sa38-20020a1709076d2600b00857b91694c1mr9618412ejc.61.1673467259083; Wed, 11 Jan 2023 12:00:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467259; cv=none; d=google.com; s=arc-20160816; b=zfnY6UkP/S/YhkSXDcA5uEVtA+j3V68QOkM1Ph5k0hH8Pvt4catoh/pVe7dSIGVmbo u8rR1y6j4ms+vb+yK7+dpFWcDWxuICrKttuynKGoQZT1ooXqBt4pmaEep+M/X845tn6E U/DvCKkUYN4nJCrRAVTogI5Cocl0sTmAEC8l+h19/3UjoYnMTFc7TwKt7dovwNRwylMv 4dAapDMKv/hqxKVdjCfqHHgM05341iLE0SbQkyN2QINfPz90Gt+ccrgQi+SyE9qzGD+m fMrXiwbCQhNfxiHbqYphO5bNbQ6xCxLCPP1ajyVy0GArcpS/0cwl/O7Bs4YYAVSuzWKO kUkg== 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=LuN/u4Nv+cz1JhgbvEoB1DJqUaT4TS7jT2ReZJoqe+U=; b=W+gealiQY9yBG2+yeVbBqlFnPkPWoOqmCxJhyBJaP6bUJY1XiPC2jC7yBZ6hSwWVHL /Ojuf4p+4vP3xz5r6hDPr0pm1IA5GL7ana5JkPfJgAmy1AJhSf6wBsIiewd4pJvche6M hep5ymCQsrQFIDkepiXcbKSyCPBMSrDKRymE0XAnyBC/FXRnb5nzv1OxfW3KmmLRkzSH sFk6l4sMJC4q+ONFALrF7xGhedOyP8/kdrXa/dtZdh5vY1m51/n55lc6BsE+eHvVwgdg i1HQ+A6FJiKX6aJs+7yYLLqrVgLNRlaIaiVEqjyyFamd030YOcSC4Ho2pTDyFyX2MALJ 2GdQ== 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 dp18-20020a170906c15200b00862fa9c105csi947166ejc.82.2023.01.11.12.00.34; Wed, 11 Jan 2023 12:00:59 -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 S239631AbjAKT6X (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235351AbjAKT5L (ORCPT ); Wed, 11 Jan 2023 14:57:11 -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 52976183AA for ; Wed, 11 Jan 2023 11:57:10 -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 1pFhDd-0005F2-OS; Wed, 11 Jan 2023 20:57:05 +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 16/20] staging: r8188eu: remove usb buffer macros Date: Wed, 11 Jan 2023 20:56:36 +0100 Message-Id: <20230111195640.306748-17-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?1754757604962272531?= X-GMAIL-MSGID: =?utf-8?q?1754757604962272531?= Remove two unused macros that allocate and free usb buffers. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_io.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 900ed2c648d4..0d2aa432f88d 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -16,12 +16,6 @@ #include #include -#define rtw_usb_buffer_alloc(dev, size, dma) \ - usb_alloc_coherent((dev), (size), (in_interrupt() ? \ - GFP_ATOMIC : GFP_KERNEL), (dma)) -#define rtw_usb_buffer_free(dev, size, addr, dma) \ - usb_free_coherent((dev), (size), (addr), (dma)) - struct intf_priv; struct intf_hdl; From patchwork Wed Jan 11 19:56:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42177 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3510828wrt; Wed, 11 Jan 2023 12:01:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuzCicksapS4LvoD2cELOME2KDr1EeeQ8wrGiZi0BlfU8QZH4AAaKEJIq3pGYdRE5a3AyVE X-Received: by 2002:a17:907:88cd:b0:85c:dc1b:dfb0 with SMTP id rq13-20020a17090788cd00b0085cdc1bdfb0mr5713012ejc.47.1673467295977; Wed, 11 Jan 2023 12:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467295; cv=none; d=google.com; s=arc-20160816; b=AdEePercAogg7ONo+Ed12h2UIBrhGnIVSNweSjcmb1nAntFSa0Uqv/rva1IQtMf1ZB 0g9vpb3byaWhospKBjxti4djASWLKQr79jiHSbc3SJsEL9SPuT+E/lp1xx3xQ9XE97p+ cJJwQ9MDzzvPjl9nVRkykkl1F/955vAiVp6OztIQT3E7o0gzFq9ghM3ErRiZbCEWXzun 6EiDa8jhPy/MzCflgpKIj+6DJut2v/dhZueUdXHSfC7CAbcSRVKlimHtq7Ul7RxYxVJc beexcCxwTiSUHUHrB2aBCLu7G+5wMRNVInC1x9lBAtHtn71TiVWW8in9pxreSlZ6YHhc gDdg== 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=HLkjcudH/91XkL9zcT3mqldIZ+sbTZiSAnDQdRAsSTM=; b=qD6u2AKDpUaGfzRH/DTqtfYItEq8lrYIF8U+xorgnX7ZzEmFwhXopc6CGbJWCmOjbI H7UxDc/CMLy/c4nm5QxbAxttRXx61pfdfcQ4FciW/dyxYz1xj4MNXFQ6bE0IVwmoRNfA ZpDiaWP4Kl8TpxQ7QWFhHFO8+cG/0SLyyZ3Si042As6YGxJQRL17sg16FIKcyMTqnMfj WVO7nyaFMqLi2sVlbwriqqbfkDg3Wpq7BWfist0asQBdmArn+4cUqOsMZkY6RTAVVRwf P4blONRL1ediwCt2S0H5+w0oJA4rzWJN8krTQ9utNQV2KvkvgqVbacb2IVgK/5SkW3jI 4Yhg== 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 gn28-20020a1709070d1c00b00860a59e0eecsi2086573ejc.80.2023.01.11.12.01.11; Wed, 11 Jan 2023 12:01:35 -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 S239785AbjAKT7O (ORCPT + 99 others); Wed, 11 Jan 2023 14:59:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235793AbjAKT5Q (ORCPT ); Wed, 11 Jan 2023 14:57:16 -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 08B4DB73 for ; Wed, 11 Jan 2023 11:57:15 -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 1pFhDe-0005F2-IF; Wed, 11 Jan 2023 20:57:06 +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 17/20] staging: r8188eu: pass struct adapter to usb_read Date: Wed, 11 Jan 2023 20:56:37 +0100 Message-Id: <20230111195640.306748-18-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?1754757643242796284?= X-GMAIL-MSGID: =?utf-8?q?1754757643242796284?= The usb_read function takes a struct intf_hdl only to extract the struct adapter from it. We can pass struct adapter directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 0deaa5c24ab2..f8900b51d750 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -7,9 +7,8 @@ #include "../include/usb_ops.h" #include "../include/rtl8188e_hal.h" -static int usb_read(struct intf_hdl *intf, u16 value, void *data, u8 size) +static int usb_read(struct adapter *adapt, u16 value, void *data, u8 size) { - struct adapter *adapt = intf->padapter; struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt); struct usb_device *udev = dvobjpriv->pusbdev; int status; @@ -95,20 +94,18 @@ static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size) int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data) { - struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; - return usb_read(intf, value, data, 1); + return usb_read(adapter, value, data, 1); } int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data) { - struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le16 le_data; int res; - res = usb_read(intf, value, &le_data, 2); + res = usb_read(adapter, value, &le_data, 2); if (res) return res; @@ -119,12 +116,11 @@ int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data) int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data) { - struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le32 le_data; int res; - res = usb_read(intf, value, &le_data, 4); + res = usb_read(adapter, value, &le_data, 4); if (res) return res; From patchwork Wed Jan 11 19:56:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42178 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3510833wrt; Wed, 11 Jan 2023 12:01:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuvl/DVIARU4ezP/rU0bvqVwOp4lJ5rftFbvUOmGSJAIjLr/xuCsLX9rPrEFaAUxJO/Crfz X-Received: by 2002:a17:907:4d8:b0:7c0:9a2f:ac93 with SMTP id vz24-20020a17090704d800b007c09a2fac93mr50300010ejb.31.1673467296647; Wed, 11 Jan 2023 12:01:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467296; cv=none; d=google.com; s=arc-20160816; b=izaT1OojgQXIKfYtZRloQs0X2iDnDxKMr5mj6b3yzC4Z5eIMt99t08r1Uwy3M8Nt81 iq8oVcguo1s8QydsEeA28CKBMhxPSUkGVUjsIHpojdeq9y/KRPH6peUcJaodcfywwBb2 s+N5O2WqqisbfUUjbqpdJHf6SSIunsNfKagVknyfbSbfvJfwMHxWyUGO8PVBkvYcLjkr xWQAZqsQRyem0QhpFwZ8eyrvdlaBVRD2WPKSogRrCrjOZgAiK3yrMLz5cVuG+uDqB9Ly bnwu8ERFD1zhG6Viv6GEIc3t3CWElVKDbKt8bN8pI2zCKR41EMYx7kg4p+ou0CmZ2In8 tpNg== 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=mtmV9l7nc5rNAnRd5tDKtgcvbDQ33xbV2FWOsTfWKIg=; b=VXx6o4INPIBSYD0YZV6EfSLIq85ShxsRXpRUoaaeBY7I8+Fw8U451LSIaux2rfSqLf aO4ZZKbV0IwcsJJENicPJYC22mIR9sKu/u+lQnWNYmrotHQAE1DvneWqgUCIKfAML29Z SqiSeiPUSha3OFxzDoUDSMxik/UF2aGJlsys+C/16z00Mk/PCq5b683WWK4WKdLJch8b gG3sRJY4fPDYS7CzuUoTHFH1azbYln/Z6lo4IbeXVNT0AHkjnTHDuMFCvN2MPBHw8AzD 9nqBCj7d/+rxTrbTea9yVQqfzzL4PoPAx5xkNg/LTDbphrDpXjg6pg7bV6zclP36OAzf VmCg== 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 f7-20020a056402354700b0047b5ecde3d7si17309140edd.257.2023.01.11.12.01.12; Wed, 11 Jan 2023 12:01:36 -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 S239655AbjAKT6h (ORCPT + 99 others); Wed, 11 Jan 2023 14:58:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235401AbjAKT5N (ORCPT ); Wed, 11 Jan 2023 14:57:13 -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 5B9021C90D for ; Wed, 11 Jan 2023 11:57:12 -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 1pFhDf-0005F2-Aj; Wed, 11 Jan 2023 20:57:07 +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 18/20] staging: r8188eu: pass struct adapter to usb_write Date: Wed, 11 Jan 2023 20:56:38 +0100 Message-Id: <20230111195640.306748-19-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?1754757643659964869?= X-GMAIL-MSGID: =?utf-8?q?1754757643659964869?= The usb_write function takes a struct intf_hdl only to extract the struct adapter from it. We can pass struct adapter directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/hal/usb_ops_linux.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index f8900b51d750..2784fc69f7d9 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -49,9 +49,8 @@ static int usb_read(struct adapter *adapt, u16 value, void *data, u8 size) return status; } -static int usb_write(struct intf_hdl *intf, u16 value, void *data, u8 size) +static int usb_write(struct adapter *adapt, u16 value, void *data, u8 size) { - struct adapter *adapt = intf->padapter; struct dvobj_priv *dvobjpriv = adapter_to_dvobj(adapt); struct usb_device *udev = dvobjpriv->pusbdev; int status; @@ -131,49 +130,45 @@ int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data) int rtw_write8(struct adapter *adapter, u32 addr, u8 val) { - struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; int ret; - ret = usb_write(intf, value, &val, 1); + ret = usb_write(adapter, value, &val, 1); return RTW_STATUS_CODE(ret); } int rtw_write16(struct adapter *adapter, u32 addr, u16 val) { - struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le16 data = cpu_to_le16(val); int ret; - ret = usb_write(intf, value, &data, 2); + ret = usb_write(adapter, value, &data, 2); return RTW_STATUS_CODE(ret); } int rtw_write32(struct adapter *adapter, u32 addr, u32 val) { - struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; __le32 data = cpu_to_le32(val); int ret; - ret = usb_write(intf, value, &data, 4); + ret = usb_write(adapter, value, &data, 4); return RTW_STATUS_CODE(ret); } int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data) { - struct intf_hdl *intf = &adapter->intf; u16 value = addr & 0xffff; int ret; if (length > VENDOR_CMD_MAX_DATA_LEN) return _FAIL; - ret = usb_write(intf, value, data, length); + ret = usb_write(adapter, value, data, length); return RTW_STATUS_CODE(ret); } 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); From patchwork Wed Jan 11 19:56:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 42180 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3512564wrt; Wed, 11 Jan 2023 12:04:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXtzvWY0Dpt6VsT5kwQu4NGchTPY4WhmSfB8nD03tWayIz2ySXhgsufB92wXUloVwGTK4D9o X-Received: by 2002:a17:90b:4cc3:b0:228:d392:fb3a with SMTP id nd3-20020a17090b4cc300b00228d392fb3amr6548832pjb.25.1673467492700; Wed, 11 Jan 2023 12:04:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673467492; cv=none; d=google.com; s=arc-20160816; b=WX+veBpuT6MPtiO+g3zxh/mQ7JY887nQsW8PMwQqT29FtBKpIrTha31rheHLPCTwVr gQSbn4RzChnJ6UlnqApd2vr9GOA5EoXpbr06zy6tFaIKyQIyupeQuC1FJI86CCXUDwfP Pch7AT5peMVij+xuSUndqV0fKbnNEU9l5+cQfbb6rHqFfmfVSeZuDi4+CugsYZg63SPz FLfXpRnyOu/r4aPyuFU3fBV/LLhKT/dmo3ZEBH6h33QwibLtmdAB6VWc8bFJBpjhEfHg 9i3G3ubOz0deeTVfNA+O3fthw7yRuDL7bByF/MvUgd3CD+G7+5IWJN8h0w6By+Rgka0h 6axQ== 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=lqf2fCmLCodnxnmgFD8J1Pna+IX1Iayf7FnvCsRtai4=; b=Fb4UZE3hnqnwSJ8fxgZJzwSQpZ1Cr6knIrtUCoYh/HXouDlFmOENX3b/Jv2qJUXGfU PnE1CxAB2HP+Ne9AVFvm/BRALu06IyWD5y7Nbigzsp93BhpwLexryP1aD4/SkvKo6AeX Wm0Ra8mAQRZ8zJvnV6GMK3MY1sSJF1gs3Q5BDlsHASBff9r5LY3aUCPtjsnh0toDzqNU xUaqFOuUbGt1EOadr1X77QeJ4bH4fzYHsl5IfzDUri0JdT256yCsdVCbJTWL7ufUoMd2 AeanFqef0dMMOZr0dJS6f9Azv9cP4TzsQPC3AhRvH5NoE1Yrz9+legumpqkodevxW0VC e3YQ== 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 71-20020a63034a000000b004ac9348e706si16092708pgd.113.2023.01.11.12.04.39; Wed, 11 Jan 2023 12:04:52 -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 S235844AbjAKUEV (ORCPT + 99 others); Wed, 11 Jan 2023 15:04:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239800AbjAKUDx (ORCPT ); Wed, 11 Jan 2023 15:03:53 -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 BDA9041039 for ; Wed, 11 Jan 2023 11:59:39 -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 1pFhDh-0005F2-0I; Wed, 11 Jan 2023 20:57:09 +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 20/20] staging: r8188eu: remove struct intf_priv Date: Wed, 11 Jan 2023 20:56:40 +0100 Message-Id: <20230111195640.306748-21-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?1754757849483417155?= X-GMAIL-MSGID: =?utf-8?q?1754757849483417155?= struct intf_priv is not used in the r8188eu driver. It can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_intf.h | 32 -------------------- drivers/staging/r8188eu/include/rtw_io.h | 2 -- 2 files changed, 34 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_intf.h b/drivers/staging/r8188eu/include/osdep_intf.h index 6d66cb57225e..457fb3852a19 100644 --- a/drivers/staging/r8188eu/include/osdep_intf.h +++ b/drivers/staging/r8188eu/include/osdep_intf.h @@ -7,38 +7,6 @@ #include "osdep_service.h" #include "drv_types.h" -struct intf_priv { - u8 *intf_dev; - u32 max_iosz; /* USB2.0: 128, USB1.1: 64, SDIO:64 */ - u32 max_xmitsz; /* USB2.0: unlimited, SDIO:512 */ - u32 max_recvsz; /* USB2.0: unlimited, SDIO:512 */ - - u8 *io_rwmem; - u8 *allocated_io_rwmem; - u32 io_wsz; /* unit: 4bytes */ - u32 io_rsz;/* unit: 4bytes */ - u8 intf_status; - - void (*_bus_io)(u8 *priv); - -/* -Under Sync. IRP (SDIO/USB) -A protection mechanism is necessary for the io_rwmem(read/write protocol) - -Under Async. IRP (SDIO/USB) -The protection mechanism is through the pending queue. -*/ - struct mutex ioctl_mutex; - /* when in USB, IO is through interrupt in/out endpoints */ - struct usb_device *udev; - struct urb *piorw_urb; - u8 io_irp_cnt; - u8 bio_irp_pending; - struct timer_list io_timer; - u8 bio_irp_timeout; - u8 bio_timer_cancel; -}; - int netdev_open(struct net_device *pnetdev); int netdev_close(struct net_device *pnetdev); diff --git a/drivers/staging/r8188eu/include/rtw_io.h b/drivers/staging/r8188eu/include/rtw_io.h index 033ea7146861..090555f562f2 100644 --- a/drivers/staging/r8188eu/include/rtw_io.h +++ b/drivers/staging/r8188eu/include/rtw_io.h @@ -16,8 +16,6 @@ #include #include -struct intf_priv; - int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data); int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data); int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data);