From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 551BAC433F5 for ; Thu, 7 Apr 2022 19:28:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230511AbiDGTas (ORCPT ); Thu, 7 Apr 2022 15:30:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230160AbiDGTak (ORCPT ); Thu, 7 Apr 2022 15:30:40 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFC1429AD3D for ; Thu, 7 Apr 2022 12:28:32 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id r10so7614399eda.1 for ; Thu, 07 Apr 2022 12:28:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=spUrDlTPoQb5W/WISiaHwyVQFy34aqJXbfUX39rUuXo=; b=Aqbx7GkMI7y3Mql3+83x97cVq81FAobXYw3EYgB12+sq7PCKL3BtUqylLZGXxHYU6B 5MHQdGl4PeqwrjydEQrzzK5bDrymR9qPSJqCc/nf7K9wk7hM1/nQjPEQ+374QYvNOFbW zdOmlj4553NM4DOqRCJKoysqoxQge2RHM17mPBb7woEba9yx0I+pPWFddhU4YlG0lLx3 /2cZFmh6Cfwnbr5E9VZbWf9U+/MF1iIZfgrl8Oypej/ULmm5Y9hkpr3VIdtkIxLkdk9r CDJsmf7XpYK/DHKhi0T5S/Mp0aieQffFrbhXpFalnef/6MrxtoxIvY2G9fhxa9aHi6Rl JN6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=spUrDlTPoQb5W/WISiaHwyVQFy34aqJXbfUX39rUuXo=; b=bqkxsDm1ZP5O2t6LXJQNornTlbAk0ANlI2g4vafbUJ7TAqOPc0Zp0kCWW6k8eh8wnV 3XjhRifQ1edsv6jtGInQ8qK/cS8yLmD1+YlrlbwL5D4plKt2IsPfuiNHaBtz/TDN1bft iXP2es4xoZWdQkqZqQl7Q4clI5RhSp/bN2opBVTxTcB9zdVyHhp5pzltUcBWICi3dKju 9L58teSLh0BHkm8nTIg3RD5utsfn1BiGJvXAsS9Ae/yy2PJbtUbJb23G661oCLgQIZCc PJlnq114FYO34r759xGrBpPoFwbeb1PhccR7Mlu4Fk67R8TIjQiNhvYvdKXKBI8ISRV5 A9yw== X-Gm-Message-State: AOAM532bIUUDAPZEGljZoK6F4vvQ66AQavMR9lZuPOrJML4fKZe040tJ 42z9LzIeEF6KEdxdxul+c6o= X-Google-Smtp-Source: ABdhPJy0WSU5QEc5x0vj8sGv8dkjsmkhDZ5gorxeDFvh5gqutGlefXOAZ95I0YAKafdhoNI0oqpDsg== X-Received: by 2002:a05:6402:27d1:b0:419:1b02:4a04 with SMTP id c17-20020a05640227d100b004191b024a04mr15790385ede.218.1649359703905; Thu, 07 Apr 2022 12:28:23 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:23 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/8] staging: r8188eu: remove unused macros from basic_types.h Date: Thu, 7 Apr 2022 21:28:12 +0200 Message-Id: <20220407192819.10661-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unused macros from basic_types.h. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/basic_types.h | 73 +------------------ 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/drivers/staging/r8188eu/include/basic_types.h b/drivers/stagin= g/r8188eu/include/basic_types.h index d82b2171d584..ffb21170e898 100644 --- a/drivers/staging/r8188eu/include/basic_types.h +++ b/drivers/staging/r8188eu/include/basic_types.h @@ -4,9 +4,6 @@ #ifndef __BASIC_TYPES_H__ #define __BASIC_TYPES_H__ =20 -#define SUCCESS 0 -#define FAIL (-1) - #include #define NDIS_OID uint =20 @@ -14,9 +11,6 @@ typedef void (*proc_t)(void *); =20 #define FIELD_OFFSET(s, field) ((ssize_t)&((s *)(0))->field) =20 -#define MEM_ALIGNMENT_OFFSET (sizeof(size_t)) -#define MEM_ALIGNMENT_PADDING (sizeof(size_t) - 1) - /* port from fw */ /* TODO: Macros Below are Sync from SD7-Driver. It is necessary * to check correctness */ @@ -31,86 +25,21 @@ typedef void (*proc_t)(void *); /* Convert little data endian to host ordering */ #define EF1BYTE(_val) \ ((u8)(_val)) -#define EF2BYTE(_val) \ - (le16_to_cpu(_val)) -#define EF4BYTE(_val) \ - (le32_to_cpu(_val)) - -/* Read data from memory */ -#define READEF1BYTE(_ptr) \ - EF1BYTE(*((u8 *)(_ptr))) -/* Read le16 data from memory and convert to host ordering */ -#define READEF2BYTE(_ptr) \ - EF2BYTE(*(_ptr)) -#define READEF4BYTE(_ptr) \ - EF4BYTE(*(_ptr)) =20 -/* Write data to memory */ -#define WRITEEF1BYTE(_ptr, _val) \ - do { \ - (*((u8 *)(_ptr))) =3D EF1BYTE(_val) \ - } while (0) -/* Write le data to memory in host ordering */ -#define WRITEEF2BYTE(_ptr, _val) \ - do { \ - (*((u16 *)(_ptr))) =3D EF2BYTE(_val) \ - } while (0) - -#define WRITEEF4BYTE(_ptr, _val) \ - do { \ - (*((u32 *)(_ptr))) =3D EF2BYTE(_val) \ - } while (0) - -/* Create a bit mask - * Examples: - * BIT_LEN_MASK_32(0) =3D> 0x00000000 - * BIT_LEN_MASK_32(1) =3D> 0x00000001 - * BIT_LEN_MASK_32(2) =3D> 0x00000003 - * BIT_LEN_MASK_32(32) =3D> 0xFFFFFFFF - */ -#define BIT_LEN_MASK_32(__bitlen) \ - (0xFFFFFFFF >> (32 - (__bitlen))) -#define BIT_LEN_MASK_16(__bitlen) \ - (0xFFFF >> (16 - (__bitlen))) +/* Create a bit mask */ #define BIT_LEN_MASK_8(__bitlen) \ (0xFF >> (8 - (__bitlen))) =20 -/* Create an offset bit mask - * Examples: - * BIT_OFFSET_LEN_MASK_32(0, 2) =3D> 0x00000003 - * BIT_OFFSET_LEN_MASK_32(16, 2) =3D> 0x00030000 - */ -#define BIT_OFFSET_LEN_MASK_32(__bitoffset, __bitlen) \ - (BIT_LEN_MASK_32(__bitlen) << (__bitoffset)) -#define BIT_OFFSET_LEN_MASK_16(__bitoffset, __bitlen) \ - (BIT_LEN_MASK_16(__bitlen) << (__bitoffset)) -#define BIT_OFFSET_LEN_MASK_8(__bitoffset, __bitlen) \ - (BIT_LEN_MASK_8(__bitlen) << (__bitoffset)) - /*Description: * Return 4-byte value in host byte ordering from * 4-byte pointer in little-endian system. */ -#define LE_P4BYTE_TO_HOST_4BYTE(__pstart) \ - (EF4BYTE(*((__le32 *)(__pstart)))) -#define LE_P2BYTE_TO_HOST_2BYTE(__pstart) \ - (EF2BYTE(*((__le16 *)(__pstart)))) #define LE_P1BYTE_TO_HOST_1BYTE(__pstart) \ (EF1BYTE(*((u8 *)(__pstart)))) =20 /*Description: Translate subfield (continuous bits in little-endian) of 4-byte value to host byte ordering.*/ -#define LE_BITS_TO_4BYTE(__pstart, __bitoffset, __bitlen) \ - ( \ - (LE_P4BYTE_TO_HOST_4BYTE(__pstart) >> (__bitoffset)) & \ - BIT_LEN_MASK_32(__bitlen) \ - ) -#define LE_BITS_TO_2BYTE(__pstart, __bitoffset, __bitlen) \ - ( \ - (LE_P2BYTE_TO_HOST_2BYTE(__pstart) >> (__bitoffset)) & \ - BIT_LEN_MASK_16(__bitlen) \ - ) #define LE_BITS_TO_1BYTE(__pstart, __bitoffset, __bitlen) \ ( \ (LE_P1BYTE_TO_HOST_1BYTE(__pstart) >> (__bitoffset)) & \ --=20 2.35.1 From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10011C433EF for ; Thu, 7 Apr 2022 19:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231309AbiDGTbF (ORCPT ); Thu, 7 Apr 2022 15:31:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231219AbiDGTav (ORCPT ); Thu, 7 Apr 2022 15:30:51 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB37629AE28 for ; Thu, 7 Apr 2022 12:28:35 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id i27so12928501ejd.9 for ; Thu, 07 Apr 2022 12:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TqnfFy/w5L8PNXWjZ8pBP5o6bpYqg195r5wJAqZzJso=; b=S0kjE+2qCuvEZ1CmUheOO7iZmHfj9QkPQUdmiTDhrKhsIXps+vyYg4r0AoAGJInCxi T5A1u37Etw4Vhc43pIa+rxhlK+cQ+qSl0jyDRPgVFYFkKSIg6aUtmfrT7kUZrSlu1Hvx tmRvmFG8KC0IrrhOpsK/6u4UeFIKMatBbftbDOvjZilcwLdL1TR207Syk1W4HfrQt7Sm WgnyQNilrGwsrX9f3pb81FPjl/jdrWpAtsrTkMfYL7ue9a/2YHdYVPfbpgzMjq8mePx4 bg42CDN7Acs+axwkiSy4Ni5/4DyOy1SYs60CGaAznvrSUUThTg4crKZjScdSGEqnYQrv UwMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TqnfFy/w5L8PNXWjZ8pBP5o6bpYqg195r5wJAqZzJso=; b=reYz9Ef9RUIMAr5sYN1ZnC/TBXgNYJoQP/hnIkSQRXJCAhDZHvfLz3jp+ffFU73ALN vBEuYqlMx/qst8Dh3SUblx3MM9ltj7zfQvT1lrj7XcNpmfqt59wsgv1cVLcusnCafwB8 ZZry5CZVJoMBDBRmkSrkpfBrMN7OsDJBSpDds7rtQScPp2HJInY9icJX2WdP6an2mWVe 1cys8IeHSoBGZy44qHxzwT6DtrMjQrKPwa3akEfkT1hLUNIOJngKwZ2JbqAHPzNINrQF gV0CQBCz1Myioh9AP7Tq0DKhvtO442kz/8hnQ+itf69tZL09HydH6966PWo99pAabPy2 Hauw== X-Gm-Message-State: AOAM532J812i5O41eZ77iG//Q9hKgHU3QyuTu6x46TFcTS+SnLdU0ZOM NACQqdwawK05HIYawkXRbDg= X-Google-Smtp-Source: ABdhPJyJpZX0eq9WO/d5bSjQFmCX1ob68cON0CQmf4s3b3e0ce4GcXHLW2Gh1FUHL/wxwhKB6176CQ== X-Received: by 2002:a17:906:2bd7:b0:6cd:f89d:c828 with SMTP id n23-20020a1709062bd700b006cdf89dc828mr15003377ejg.232.1649359704644; Thu, 07 Apr 2022 12:28:24 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:24 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/8] staging: r8188eu: move struct rt_firmware to rtw_fw.h Date: Thu, 7 Apr 2022 21:28:13 +0200 Message-Id: <20220407192819.10661-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move the rt_firmware structure to the header rtw_fw.h to have firmware related things in one place. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/drv_types.h | 6 +----- drivers/staging/r8188eu/include/rtw_fw.h | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/= r8188eu/include/drv_types.h index 09fc27082f7c..ffab2ee0848a 100644 --- a/drivers/staging/r8188eu/include/drv_types.h +++ b/drivers/staging/r8188eu/include/drv_types.h @@ -35,6 +35,7 @@ #include "rtw_ap.h" #include "rtw_br_ext.h" #include "rtl8188e_hal.h" +#include "rtw_fw.h" =20 #define DRIVERVERSION "v4.1.4_6773.20130222" =20 @@ -116,11 +117,6 @@ struct registry_priv { =20 #define MAX_CONTINUAL_URB_ERR 4 =20 -struct rt_firmware { - u8 *data; - u32 size; -}; - struct dvobj_priv { struct adapter *if1; =20 diff --git a/drivers/staging/r8188eu/include/rtw_fw.h b/drivers/staging/r81= 88eu/include/rtw_fw.h index c4b1a8370b4a..8f74157ee9ac 100644 --- a/drivers/staging/r8188eu/include/rtw_fw.h +++ b/drivers/staging/r8188eu/include/rtw_fw.h @@ -4,6 +4,11 @@ #ifndef __RTW_FW_H__ #define __RTW_FW_H__ =20 +struct rt_firmware { + u8 *data; + u32 size; +}; + #include "drv_types.h" =20 int rtl8188e_firmware_download(struct adapter *padapter); --=20 2.35.1 From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39251C433F5 for ; Thu, 7 Apr 2022 19:29:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231460AbiDGTbJ (ORCPT ); Thu, 7 Apr 2022 15:31:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230160AbiDGTav (ORCPT ); Thu, 7 Apr 2022 15:30:51 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE9A129AE37 for ; Thu, 7 Apr 2022 12:28:35 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id bg10so12976892ejb.4 for ; Thu, 07 Apr 2022 12:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vGCnlEHv9nw64WsEYjnHYKjP/dibbUbwl/jK2KIozQA=; b=AQq+1KHDxXa1zjrf8HoZKiXspUf+//Y+QDa+9qBI+z3L5VqeQtNEkcjwZhgdxo2SVp TKYNFLag/PTEpMecTsXAbVH8JteoQWPcjoZB9MokFO7oE15kZ4YrpfCsRqFmLtu8Dud6 pWUTrPiyomAq18QmqaEGL0PKDZk5p/KqXsBdQD5Wl8vyskDgjYhTRcxp9hyHX15cd9Bh 7m/1RPy8+Sw0Z0ruT18ogjT3HPw5o2gXA54LolBn4rnP+6cNw0mLswm/qshqqIZ0GgbY XoTuMbsUBPmjeMg0WqIzyPB2fVnr07rsTiMVq1JoE5GmdyqNxYS0jV/oGf0yp0vTBTLl UThg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vGCnlEHv9nw64WsEYjnHYKjP/dibbUbwl/jK2KIozQA=; b=tcAEfB522eifi9DchGlBX3vfp/T7yigTf57uleKVgk4kVnqxJHbD6YqlStsRDcXHhP onMv5xIq8eX8IqL+KgnODQIzcXbFnHtARFrkFo8E4RbooHVCGbj3kYYvACV8FGi6tW4I DCqrQk/yMccqPXSu3v+LCMBy0WeMVz5dgt3dTTRdCBaiBV9nWn4EGod7Mcbag8zQNGQE xBHkJud0PYTlrDh0XvNIFWXpV0BJh0tKpY3kgNoraOKbHz2AtHOuPEwT7Jyngsy8e02A RFKItVojZRJ5nFxOeUQbbsE+UkcBwx5TiCQImpQOfF7N46erk8RXLDFPopI/3itXleIh imnw== X-Gm-Message-State: AOAM532QxlMBSgVD5t9NVCR70W3Osw5gagOCbr8GATVmopTzhO0lhbmn KWyN53fAoD/JntUFYHQLAw4= X-Google-Smtp-Source: ABdhPJzEFoHfdPqrpWj911wljIo/Sbv2TKeaYUCXMGhMI3KFyQrAccJqWJ7oaqqjx240JzkRsNUm6w== X-Received: by 2002:a17:907:d8d:b0:6df:b214:392a with SMTP id go13-20020a1709070d8d00b006dfb214392amr15222921ejc.669.1649359705463; Thu, 07 Apr 2022 12:28:25 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:25 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/8] staging: r8188eu: ROMVer is always zero Date: Thu, 7 Apr 2022 21:28:14 +0200 Message-Id: <20220407192819.10661-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The variable ROMVer in struct HAL_VERSION is set to zero and never changed. Remove it and replace its use with zero. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/hal_com.c | 2 +- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 1 - drivers/staging/r8188eu/include/HalVerDef.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/hal/hal_com.c b/drivers/staging/r8188e= u/hal/hal_com.c index 7649f9919f67..910cc07f656c 100644 --- a/drivers/staging/r8188eu/hal/hal_com.c +++ b/drivers/staging/r8188eu/hal/hal_com.c @@ -44,7 +44,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers) =20 cnt +=3D sprintf((buf + cnt), "1T1R_"); =20 - cnt +=3D sprintf((buf + cnt), "RomVer(%d)\n", chip_vers.ROMVer); + cnt +=3D sprintf((buf + cnt), "RomVer(%d)\n", 0); =20 pr_info("%s", buf); } diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/stag= ing/r8188eu/hal/rtl8188e_hal_init.c index 6811be95da9a..609138887b25 100644 --- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c @@ -505,7 +505,6 @@ void rtl8188e_read_chip_version(struct adapter *padapte= r) =20 ChipVersion.VendorType =3D ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHI= P_VENDOR_TSMC); ChipVersion.CUTVersion =3D (value32 & CHIP_VER_RTL_MASK) >> CHIP_VER_RTL_= SHIFT; /* IC version (CUT) */ - ChipVersion.ROMVer =3D 0; /* ROM code version. */ =20 dump_chip_info(ChipVersion); =20 diff --git a/drivers/staging/r8188eu/include/HalVerDef.h b/drivers/staging/= r8188eu/include/HalVerDef.h index 56dadadb1a0f..7a530c7d57eb 100644 --- a/drivers/staging/r8188eu/include/HalVerDef.h +++ b/drivers/staging/r8188eu/include/HalVerDef.h @@ -25,7 +25,6 @@ struct HAL_VERSION { enum HAL_CHIP_TYPE ChipType; enum HAL_CUT_VERSION CUTVersion; enum HAL_VENDOR VendorType; - u8 ROMVer; }; =20 /* Get element */ --=20 2.35.1 From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF94FC433F5 for ; Thu, 7 Apr 2022 19:29:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230402AbiDGTbB (ORCPT ); Thu, 7 Apr 2022 15:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230457AbiDGTaq (ORCPT ); Thu, 7 Apr 2022 15:30:46 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 911B629B7DC for ; Thu, 7 Apr 2022 12:28:39 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id bg10so12976928ejb.4 for ; Thu, 07 Apr 2022 12:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wnTbVdy3uat7re2/juPonFklxWNyK89ebuwaKNLBbWU=; b=bHEgGFlejC0vA5GIGYJCTRgW+62fOE07VV1oIh0ULpSxNPVDs7Crq8tng1eP3bPCrr MZejo/w74kPfI5tmypAEQNOw/08WlUNbWKariIeozihTmnO+8rB7XbLD5EnbQFtf5yHR KXFO/D3lm1DqtgxbypU98uHO6/Kjsv/kbn1NRyRA7ffAwvxXwCN1zMqk8/YQGCH2P85b b+05e+MzDSmtp6Sz2ENZyioygmJT+pOFIbDY0FpVQ2PUWHoGjDqx6MUBo1v4BE9HRNB6 bsqphuASgGWefs25oLSr2NM0LQuHnV/gvAMzfTEp8y6defaTuhCNtSL1wr62j0JPgqGa 7eXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wnTbVdy3uat7re2/juPonFklxWNyK89ebuwaKNLBbWU=; b=GDcI4gxK4cFgCKN0rPctmSz9TsFa2ct/eIixm3XSik0Jg9kRh/GCRqT1wAkF1+pgFS lhZ5ghD8gPft1gV9POfNjPALKolw5BcvmXkCkLVS1oRDQUaBnQ46mB+fWP+HSXYlQ0pG jxPFhUy0XLvg3TeCt2tGSGXkGORZy2P+BDReJ+RgiQyKIaD/Exz0f0QcZgnMPvqpaT1e SQCSvB/5X7whUIWM8WoTyORXuP42Nj+wi7t+czn5e8hCC0hemGdC5YkTchlEgWoIAIYG pHWt9IhyDB7PHHvtYcAC3So7srKtsRc3pknAjun0W5sX/uQsmZhDGiXlKB88H9+J4huL kd4g== X-Gm-Message-State: AOAM531mlhIrveDQGiNVs/bWLf2ccOFcYUhT++88OgFtm84z2gklKvHO DhHdmaSMW6m0aQqS8MH988Q= X-Google-Smtp-Source: ABdhPJw46DX5p9tNemvjd8lEzMNSiQDkXYThLCxegQUrEqGXGes/Jno7y/w1kC/1LeRIyYPy5J//UA== X-Received: by 2002:a17:907:7252:b0:6df:75cc:615e with SMTP id ds18-20020a170907725200b006df75cc615emr15235818ejc.683.1649359706161; Thu, 07 Apr 2022 12:28:26 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:25 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/8] staging: r8188eu: remove unused fields from struct eeprom_priv Date: Thu, 7 Apr 2022 21:28:15 +0200 Message-Id: <20220407192819.10661-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unused fields from struct eeprom_priv. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/rtw_eeprom.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_eeprom.h b/drivers/staging= /r8188eu/include/rtw_eeprom.h index 3e8d3bb48903..d8d48ace356c 100644 --- a/drivers/staging/r8188eu/include/rtw_eeprom.h +++ b/drivers/staging/r8188eu/include/rtw_eeprom.h @@ -11,10 +11,7 @@ =20 struct eeprom_priv { u8 bautoload_fail_flag; - u8 bloadfile_fail_flag; - u8 bloadmac_fail_flag; u8 mac_addr[ETH_ALEN] __aligned(2); /* PermanentAddress */ - u16 channel_plan; u8 EepromOrEfuse; u8 efuse_eeprom_data[HWSET_MAX_SIZE_512] __aligned(4); }; --=20 2.35.1 From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A565C433EF for ; Thu, 7 Apr 2022 19:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231387AbiDGTbN (ORCPT ); Thu, 7 Apr 2022 15:31:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231180AbiDGTar (ORCPT ); Thu, 7 Apr 2022 15:30:47 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE144299F0A for ; Thu, 7 Apr 2022 12:28:39 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id b24so7569757edu.10 for ; Thu, 07 Apr 2022 12:28:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+0bJLwilh7WH2dJze8SpTafU8NcKHXjFenPKKfg6dz0=; b=dnl4yaFuJmzRJC1dsaooha0LilBinNwtGkCoaNEJhxbia6EkFOwbDMQLmz053BoCZM 8mk/PkRWyc25WSQYa/2LGIPgHq+ANdc3PNw9ywtwNp3puDiAle5l9Ti19+NSHNS6h+9s I2OXARH9wZrMHvzQFCSKKd2YnJByv9LE7wafacsQQXZMHfgCCj6LNEJ4sOkfuVXE73q/ DsLE5Ose7jz0ClePmdd1EJyycSgby8ALw6GCRRwfqGTMlIc7P1XCqSssNBrn4W6s9u5W BomzNtPs/LKVp0NUCNExJRe10BAf4Mfu7QUAX2X5/oy/VE282vfMLF+NGRBD3mhEYZkd Kg+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+0bJLwilh7WH2dJze8SpTafU8NcKHXjFenPKKfg6dz0=; b=KA2M6JsIwA7RKiA2q/gQ34lcKqARn+WkOcSBt11YPszUjEYmXVdcsBwEog96iK0l7d feAQXp9T8vdj+A8+XEzWCSJLfLUPEZ5mpFnip6b4S/dhs6ZHLDDyJX6zHyjLppcJHDGi xepjxb6YAivfs7B3prkiYLUl14a7QfPJ4d/9oVhl77c9acg1pMfCmb4sAu1QpOGH0X9u ULdzBkzlK9U3OPl8y7Mjt88NF/D1uqonAwKpzagZ2+PEbKQFJIjViH2lozrTJak6dbqr 959wOPszPN2mDMTULy7flOJQhgfa8iIKvQ9SkG87LMM7zvNETLcmTaAIX3jQi93hms9A OsLg== X-Gm-Message-State: AOAM530y4rklHn4XK7wgo+ifqMEwQDjnBmt+Flun+vrM6BXiX55i1Pw0 5BXGipEaDYOqGoyjYjBtfoM= X-Google-Smtp-Source: ABdhPJyyQYuQXxG644w9SUnoQFO/aKp53IZJZzJXHr158yoRDweK+HSZIsQB7ggegFWEDrPbpl1BBw== X-Received: by 2002:a05:6402:d0a:b0:418:ec3b:2242 with SMTP id eb10-20020a0564020d0a00b00418ec3b2242mr16149692edb.229.1649359706885; Thu, 07 Apr 2022 12:28:26 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:26 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 5/8] staging: r8188eu: remove unused enums from odm.h Date: Thu, 7 Apr 2022 21:28:16 +0200 Message-Id: <20220407192819.10661-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unused enums from odm.h. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/odm.h | 29 --------------------------- 1 file changed, 29 deletions(-) diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188e= u/include/odm.h index 1902aa48a255..f131e17167bf 100644 --- a/drivers/staging/r8188eu/include/odm.h +++ b/drivers/staging/r8188eu/include/odm.h @@ -98,22 +98,6 @@ struct odm_per_pkt_info { bool bPacketBeacon; }; =20 -enum odm_ability { - /* BB Team */ - ODM_DIG =3D 0x00000001, - ODM_HIGH_POWER =3D 0x00000002, - ODM_CCK_CCA_TH =3D 0x00000004, - ODM_FA_STATISTICS =3D 0x00000008, - ODM_RAMASK =3D 0x00000010, - ODM_RSSI_MONITOR =3D 0x00000020, - ODM_SW_ANTDIV =3D 0x00000040, - ODM_HW_ANTDIV =3D 0x00000080, - ODM_BB_PWRSV =3D 0x00000100, - ODM_2TPATHDIV =3D 0x00000200, - ODM_1TPATHDIV =3D 0x00000400, - ODM_PSD2AFH =3D 0x00000800 -}; - /* 2011/10/20 MH Define Common info enum for all team. */ =20 enum odm_common_info_def { @@ -137,19 +121,6 @@ enum odm_ability_def { =20 # define ODM_ITRF_USB 0x2 =20 -/* ODM_CMNINFO_OP_MODE */ -enum odm_operation_mode { - ODM_NO_LINK =3D BIT(0), - ODM_LINK =3D BIT(1), - ODM_SCAN =3D BIT(2), - ODM_POWERSAVE =3D BIT(3), - ODM_AP_MODE =3D BIT(4), - ODM_CLIENT_MODE =3D BIT(5), - ODM_AD_HOC =3D BIT(6), - ODM_WIFI_DIRECT =3D BIT(7), - ODM_WIFI_DISPLAY =3D BIT(8), -}; - /* ODM_CMNINFO_WM_MODE */ enum odm_wireless_mode { ODM_WM_UNKNOW =3D 0x0, --=20 2.35.1 From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 101F8C433F5 for ; Thu, 7 Apr 2022 19:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230319AbiDGTbS (ORCPT ); Thu, 7 Apr 2022 15:31:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbiDGTa4 (ORCPT ); Thu, 7 Apr 2022 15:30:56 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5546529AD1A for ; Thu, 7 Apr 2022 12:28:41 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id bq8so12917047ejb.10 for ; Thu, 07 Apr 2022 12:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=86bWkUU1DWtqExQIpuhgVcDC/r0eepfnI3UV3du+ILA=; b=ZF2eIv9ThBCqKphf5UMqpw+cNVjGX1YXmq3VIN2ZG93OmjFxooJ63vFD/WayYDMhSz 4kR1GsaWyTnu7Ah8tJuLyNGvAY/FKomCHoki9gT/ELaTi0J1CZfnOWUwEQ33gHjP9wU0 shH417CVQUtfVxRtAOe1MxfAg05a6HN304tCV1HjhQG1HWSmPTQAZTJz1SLe/opBo/oT mKLDAu3fqxTqCWdT8sQjsOhHLLNkkocVPi9bmZQ1WBo/TzrtTbwNs/Tm+cIhGV+mV8xU giAuMOTgDOskKbuTMBrNU540HXV9jdmgSSBPYy01eJOWt6UAXaz5bhN0HoOeng6b3J/B rP0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=86bWkUU1DWtqExQIpuhgVcDC/r0eepfnI3UV3du+ILA=; b=l+0H/D8xegrBD2Bu5tLpLxL70fFL6qp2NEcMPJSrTqB3U3yRoKrIMYgeYo/EU+YdSx muJk00xB8CDnxFe0cMCdDezm51FA+jYE3IhtZCmpiAwuZrQlGwLxJah7xo4KtqJVSnAe Fwl+MLFEMC72DsoIuEOXLyVt8jvnUVjKv6gtLxVOIs6gm6vzSDJQqrESsnThfP1ZCRJA thw1YLz8EaRdcb6JrOQsh+iHlZXVb8XnSfIe/wP/hFcHODIU3XhZ02IOpDBOJYIGvoGj +M+89RBlT5GASzE1PZZOEXvwdtP83vWg3Lb7+FRFIQYfZwqXS0D/U0Be2xvkNebiH1VA ZLHg== X-Gm-Message-State: AOAM531hTaeQhBoIxjsPeuMfejVCSKuI3WUKuJkrto2iamydm6mknAzg xCXf2wQxxNCoXy9R1TIySHw= X-Google-Smtp-Source: ABdhPJzaDeHLK//UqDlGr1gZKqD0RXONg04r9gqQGNsD312Pou1R2vAcj3+LLuu11D1pIy3u8bUNEA== X-Received: by 2002:a17:907:3fa8:b0:6d3:477a:efe with SMTP id hr40-20020a1709073fa800b006d3477a0efemr15353946ejc.401.1649359707559; Thu, 07 Apr 2022 12:28:27 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:27 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 6/8] staging: r8188eu: remove unused prototype usbvendorrequest() Date: Thu, 7 Apr 2022 21:28:17 +0200 Message-Id: <20220407192819.10661-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unused prototype usbvendorrequest(). Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/usb_osintf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging= /r8188eu/include/usb_osintf.h index 3e777ca52745..32ca8ef95b23 100644 --- a/drivers/staging/r8188eu/include/usb_osintf.h +++ b/drivers/staging/r8188eu/include/usb_osintf.h @@ -13,9 +13,6 @@ extern int rtw_mc2u_disable; =20 #define USBD_HALTED(Status) ((u32)(Status) >> 30 =3D=3D 3) =20 -u8 usbvendorrequest(struct dvobj_priv *pdvobjpriv, enum bt_usb_request bre= quest, - enum rt_usb_wvalue wvalue, u8 windex, void *data, - u8 datalen, u8 isdirectionin); void netdev_br_init(struct net_device *netdev); void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb); void *scdb_findEntry(struct adapter *priv, unsigned char *ipAddr); --=20 2.35.1 From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDA23C433EF for ; Thu, 7 Apr 2022 19:29:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230346AbiDGTbV (ORCPT ); Thu, 7 Apr 2022 15:31:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231233AbiDGTax (ORCPT ); Thu, 7 Apr 2022 15:30:53 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8341299F3B for ; Thu, 7 Apr 2022 12:28:42 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id r13so12971540ejd.5 for ; Thu, 07 Apr 2022 12:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=csidvWKCgQbNsJ3hDpmUS3N7kEV8FSmE0B1p9bl3FMU=; b=LCu+8Ovpgl9eYTcuwb9Q+M+QEA9KhFYou0ivJCjsTwaltep73B3ZdO1n4lkl2W3yCQ j31AwtDH9VwcD7fP4iVBI2xbg/FVS+EgU4fJ5fK53ZL3kdmJwBiuq334yaTT19zLXdkO EiRcu8tiWimxrjzsmOSyWdwvG5lcYobdtRNOkFWnbvsIF5GaxJdj/EwVRR2JSrI2mvlL ckAQHbaBXo7sSI4alS5N1FxxQHVJmwxe+eIKzn5eanaM+JetFzhT3dJfvbLU9XWFvhsG XWvPB80I/duS6lVIPdRrq/CYZWMOi8o7fkrOA3eTYuxjEGULJL8BWFQNgQkabeqY2L+J k53Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=csidvWKCgQbNsJ3hDpmUS3N7kEV8FSmE0B1p9bl3FMU=; b=mOx/KluE5mPbCHboflYwd3tHpCqyYp7ybnOdv1RbPTUmgx3XNjZRFwkybWKCE97ldW i5zRJP4mxVibmgIA8EhdoB2S7Oe0/MEAZLtw05S4N6VI9uUEq/Rxw9PuqTUdTg5PUYbC 0MU6SUzNoiZPR6VGlDzHLF0P4gt9IC21tEPGT6zRWuBeuD/e//K81ph3PaDGqT++Z973 UcdGxqV7pRRO6yktYkIKyHtxG3DLUi453vpjYmhPNwrqkRFp8g1QMNzy4q4fIK2Tek6i w4HTzO4tD2yRhNNN3jWuQLdPnA/p6MZgzGs6qbIv5pxZqtAAWKXB0F7pYsrtpsbwfDsL InZg== X-Gm-Message-State: AOAM53202mqwwBuHYdu2iEswMhU4vUnEOiYvgvDY919hsgAxcV3oSyEz 1fHzXo/9oBxu/IAFp5qRJgE= X-Google-Smtp-Source: ABdhPJwPEspTPVDkuTZWkXizEfUbEEQmpCfYnRTlDuuAVtSDtN1nu/T/Le5/Sgq3ZtzFiCywokVd2g== X-Received: by 2002:a17:906:c103:b0:6e0:df50:7f52 with SMTP id do3-20020a170906c10300b006e0df507f52mr15212510ejc.501.1649359708305; Thu, 07 Apr 2022 12:28:28 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:27 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 7/8] staging: r8188eu: remove header usb_vendor_req.h Date: Thu, 7 Apr 2022 21:28:18 +0200 Message-Id: <20220407192819.10661-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Nothing from the header usb_vendor_req.h is used in the driver code. Remove the header. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/usb_osintf.h | 1 - .../staging/r8188eu/include/usb_vendor_req.h | 35 ------------------- drivers/staging/r8188eu/os_dep/usb_intf.c | 1 - 3 files changed, 37 deletions(-) delete mode 100644 drivers/staging/r8188eu/include/usb_vendor_req.h diff --git a/drivers/staging/r8188eu/include/usb_osintf.h b/drivers/staging= /r8188eu/include/usb_osintf.h index 32ca8ef95b23..f271e93e9ab9 100644 --- a/drivers/staging/r8188eu/include/usb_osintf.h +++ b/drivers/staging/r8188eu/include/usb_osintf.h @@ -6,7 +6,6 @@ =20 #include "osdep_service.h" #include "drv_types.h" -#include "usb_vendor_req.h" =20 extern char *rtw_initmac; extern int rtw_mc2u_disable; diff --git a/drivers/staging/r8188eu/include/usb_vendor_req.h b/drivers/sta= ging/r8188eu/include/usb_vendor_req.h deleted file mode 100644 index 7337b1b7419f..000000000000 --- a/drivers/staging/r8188eu/include/usb_vendor_req.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef _USB_VENDOR_REQUEST_H_ -#define _USB_VENDOR_REQUEST_H_ - -/* 4 Set/Get Register related wIndex/Data */ -#define RT_USB_RESET_MASK_OFF 0 -#define RT_USB_RESET_MASK_ON 1 -#define RT_USB_SLEEP_MASK_OFF 0 -#define RT_USB_SLEEP_MASK_ON 1 -#define RT_USB_LDO_ON 1 -#define RT_USB_LDO_OFF 0 - -/* 4 Set/Get SYSCLK related wValue or Data */ -#define RT_USB_SYSCLK_32KHZ 0 -#define RT_USB_SYSCLK_40MHZ 1 -#define RT_USB_SYSCLK_60MHZ 2 - -enum bt_usb_request { - RT_USB_SET_REGISTER =3D 1, - RT_USB_SET_SYSCLK =3D 2, - RT_USB_GET_SYSCLK =3D 3, - RT_USB_GET_REGISTER =3D 4 -}; - -enum rt_usb_wvalue { - RT_USB_RESET_MASK =3D 1, - RT_USB_SLEEP_MASK =3D 2, - RT_USB_USB_HRCPWM =3D 3, - RT_USB_LDO =3D 4, - RT_USB_BOOT_TYPE =3D 5 -}; - -#endif diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index ffd727fb32e3..7bd5ab7e5248 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -8,7 +8,6 @@ #include "../include/xmit_osdep.h" #include "../include/hal_intf.h" #include "../include/osdep_intf.h" -#include "../include/usb_vendor_req.h" #include "../include/usb_ops.h" #include "../include/usb_osintf.h" #include "../include/rtw_ioctl.h" --=20 2.35.1 From nobody Tue Jun 9 21:17:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A216BC433EF for ; Thu, 7 Apr 2022 19:29:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231365AbiDGTb2 (ORCPT ); Thu, 7 Apr 2022 15:31:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231226AbiDGTax (ORCPT ); Thu, 7 Apr 2022 15:30:53 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A978E29C943 for ; Thu, 7 Apr 2022 12:28:45 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id d10so7663834edj.0 for ; Thu, 07 Apr 2022 12:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4GbYZVMFElHvzO+iQClMBl41EoDQR5lCZDpNuOsesIM=; b=f32jQxMh6cZJunXjmKXPIN2VZ4JZ80H5ldflvegBNmDDa31AknYQsB+Nj3CURL2CXY 5OwinzxJ6SpDcYo6Cp01D1NtEwCAPf8lAcDUBx09nsGpQOTM7VQGqU6UEN/JOe2IGdjE QtrPIYNvH0+yEcrelL4w09e7Mk0p9T32Nj+PQokm4HWUlm27K+K3sxqD2bMlAFCe/wlq XF/q0jJCT/fxtpwgFS/yNMLU13bdueiDNaHFQCGhbkrF/KxcAUwZDd0C9OQUrp6Ej/43 aaLKtoUKZ7IzdqabGq2yDjTBRJu990iN0h8FPrbWIyaxVKbiJIsHLE++xkGX6UPJUCcS PZVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4GbYZVMFElHvzO+iQClMBl41EoDQR5lCZDpNuOsesIM=; b=jEsXGogr3KoByIAUGSJsVi+v+dVju/BIyWR3tEA4KxgByqk6+vjHIEbaPn+mEyC4Pn 3Yx14taBtEYCW4BtKhwrYqdBzGqzEd4HU3XkCYq61jbdW4aCS89E7DfpODF6KPD/Fjrq bHYBWEGMf7DDIHAQQpFpRXPg6WmvupgGYPcahdcdADldBf3KOOkrUxdgIDQ9MhdfIWpb pjA4tkYvrkBz78DKpO0zLICJhx0LxgijORshKNII+/ynT5N2gTKNSGLSyJU5iTh+a4sH CF4r6f0zmai+SnR46/8anLb8ikYBxFMcbHEJw60UMynR8FJ2pEFvyJmlm9DyPlVNh6FB QAkQ== X-Gm-Message-State: AOAM532pApWNpakOjzX4c/86np5+Qw9iy/rVtpQZqnFd4+NzprMqz+z6 CxiQFbsuQnem8XLLyWLTR/A= X-Google-Smtp-Source: ABdhPJwa2YoCvcD2WKGzObGQEXzbP4u8iJPAKRnadWcx7XVVMMiZd+6wnUsRPw0XVcwmt143NjEf5A== X-Received: by 2002:a05:6402:4247:b0:419:3990:3db6 with SMTP id g7-20020a056402424700b0041939903db6mr15627565edb.193.1649359709066; Thu, 07 Apr 2022 12:28:29 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id k14-20020a50e18e000000b0041b6f23f7f6sm9652798edl.22.2022.04.07.12.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 12:28:28 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 8/8] staging: r8188eu: clean up rtw_ioctl.h Date: Thu, 7 Apr 2022 21:28:19 +0200 Message-Id: <20220407192819.10661-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407192819.10661-1-straube.linux@gmail.com> References: <20220407192819.10661-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are lots of unused macros, structs, etc. in the header rtw_ioctl.h. Remove them. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/include/rtw_ioctl.h | 79 --------------------- 1 file changed, 79 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_ioctl.h b/drivers/staging/= r8188eu/include/rtw_ioctl.h index a36bd7313755..c704f3040ac8 100644 --- a/drivers/staging/r8188eu/include/rtw_ioctl.h +++ b/drivers/staging/r8188eu/include/rtw_ioctl.h @@ -7,86 +7,7 @@ #include "osdep_service.h" #include "drv_types.h" =20 -#ifndef OID_802_11_CAPABILITY - #define OID_802_11_CAPABILITY 0x0d010122 -#endif - -#ifndef OID_802_11_PMKID - #define OID_802_11_PMKID 0x0d010123 -#endif - -/* For DDK-defined OIDs */ -#define OID_NDIS_SEG1 0x00010100 -#define OID_NDIS_SEG2 0x00010200 -#define OID_NDIS_SEG3 0x00020100 -#define OID_NDIS_SEG4 0x01010100 -#define OID_NDIS_SEG5 0x01020100 -#define OID_NDIS_SEG6 0x01020200 -#define OID_NDIS_SEG7 0xFD010100 -#define OID_NDIS_SEG8 0x0D010100 -#define OID_NDIS_SEG9 0x0D010200 -#define OID_NDIS_SEG10 0x0D020200 - -#define SZ_OID_NDIS_SEG1 23 -#define SZ_OID_NDIS_SEG2 3 -#define SZ_OID_NDIS_SEG3 6 -#define SZ_OID_NDIS_SEG4 6 -#define SZ_OID_NDIS_SEG5 4 -#define SZ_OID_NDIS_SEG6 8 -#define SZ_OID_NDIS_SEG7 7 -#define SZ_OID_NDIS_SEG8 36 -#define SZ_OID_NDIS_SEG9 24 -#define SZ_OID_NDIS_SEG10 19 - -/* For Realtek-defined OIDs */ -#define OID_MP_SEG1 0xFF871100 -#define OID_MP_SEG2 0xFF818000 - -#define OID_MP_SEG3 0xFF818700 -#define OID_MP_SEG4 0xFF011100 - -enum oid_type { - QUERY_OID, - SET_OID -}; - -struct oid_funs_node { - unsigned int oid_start; /* the starting number for OID */ - unsigned int oid_end; /* the ending number for OID */ - struct oid_obj_priv *node_array; - unsigned int array_sz; /* the size of node_array */ - int query_counter; /* count the number of query hits for this segment */ - int set_counter; /* count the number of set hits for this segment */ -}; - -struct oid_par_priv { - void *adapter_context; - NDIS_OID oid; - void *information_buf; - u32 information_buf_len; - u32 *bytes_rw; - u32 *bytes_needed; - enum oid_type type_of_oid; - u32 dbg; -}; - -struct oid_obj_priv { - unsigned char dbg; /* 0: without OID debug message - * 1: with OID debug message */ - int (*oidfuns)(struct oid_par_priv *poid_par_priv); -}; - extern struct iw_handler_def rtw_handlers_def; - -int drv_query_info(struct net_device *miniportadaptercontext, NDIS_OID oi= d, - void *informationbuffer, u32 informationbufferlength, - u32 *byteswritten, u32 *bytesneeded); - -int drv_set_info(struct net_device *MiniportAdapterContext, - NDIS_OID oid, void *informationbuffer, - u32 informationbufferlength, u32 *bytesread, - u32 *bytesneeded); - extern int ui_pid[3]; =20 #endif /* #ifndef __INC_CEINFO_ */ --=20 2.35.1