From mboxrd@z Thu Jan 1 00:00:00 1970 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 10B22C433F5 for ; Tue, 1 Feb 2022 08:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234998AbiBAInc (ORCPT ); Tue, 1 Feb 2022 03:43:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235611AbiBAInQ (ORCPT ); Tue, 1 Feb 2022 03:43:16 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B79F8C061714 for ; Tue, 1 Feb 2022 00:43:15 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id k25so51425010ejp.5 for ; Tue, 01 Feb 2022 00:43:15 -0800 (PST) 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=OcUGeKeL0EKOInXkDi+QcgFMbDvuAB8kSfpOxKij6ak=; b=PR7yHOYioAX2deO8cix58412+wwLYYrBAbbOC2m9XN1KykCipNLjrMwXjL8nvG6IRb LpC77SDbXZCv3G/CcC/Ofkynkm4Ef0omIscGoEWUsZVhocfvNv8YolFzsWxCQA12qwEN M+R2eaA4FlPMK/KSp8lk6XMZ1fU2IybweshCjuuovVHRCtBIR6tpVvy2JnXGM0qSIdxS KLug+UsctjnbtAhvmEVsPV1dH6mOaB96JaHf66ZsuR93wgPJwjrJTuzjVJXly5PZC9XT +R02ZXoJ8TVd1VVVmu7lb6LYbNv7Y8fuqk7LXzmM4c6gfXJsWQsydt48T7kEDRy0Jq8H NNYQ== 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=OcUGeKeL0EKOInXkDi+QcgFMbDvuAB8kSfpOxKij6ak=; b=Xs71xlQq/kDemieeV9JdsB2XOOlfXRk6nSlEgJKV88DVMnGxlnGHdxp2MOxI3+VfD0 LId9QjjkX4ByXosXpxFk9P4WCwSv2bO+0/oPKsTYCxWwuCneNg+UKdjrNg/XqdImZDbx ue24lT8jKf5alNvED25bwz6gOHNREtGl6tSVRQEmSRhgXgtgIp8M/Xf225X1i+hvHogv gmj8BQRjnS0A9q0tdyCBPEm9GcLFAWapEUMBjQVcxona1ifMOZPUgBm4vBxh42CyXRUZ 77uUecn9gIBlIJj+mvSxZQyD/jSMbVOckyfPjBuPhXvKxk4aHdNUT0l0DrfosY9ApIxu B20A== X-Gm-Message-State: AOAM5300A0abH1XLGNY+Q0P2PhTy5T4mjAo7snuY9DAkOW5qfHrI36j2 8iPTdz2tr30DRuFci5HaqqE= X-Google-Smtp-Source: ABdhPJzUgp2XxgqLgCIJm0f9UXHF21ZR6+g2nDatAa8NidWaOKFPmVjYOGPhPE1uTppAue1yGH/WXA== X-Received: by 2002:a17:907:7289:: with SMTP id dt9mr21039217ejc.62.1643704994382; Tue, 01 Feb 2022 00:43:14 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id c14sm19123431edy.66.2022.02.01.00.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 00:43:14 -0800 (PST) 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/9] staging: r8188eu: remove UsbTxAggDescNum from struct hal_data_8188e Date: Tue, 1 Feb 2022 09:42:55 +0100 Message-Id: <20220201084259.7497-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com> References: <20220201084259.7497-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org UsbTxAggDescNum in struct hal_data_8188e is set to 0x6 and never changed. Define this constant and remove UsbTxAggDescNum from the hal_data_8188e structure. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 2 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 +-- drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 - drivers/staging/r8188eu/include/rtl8188e_xmit.h | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c index 293541db597d..94dafc7c1ad0 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -518,7 +518,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp if (pbuf < bulkptr) { desc_cnt++; - if (desc_cnt == haldata->UsbTxAggDescNum) + if (desc_cnt == USB_TXAGG_DESC_NUM) break; } else { desc_cnt = 0; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index e6c253122e9c..f33586a740af 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -54,7 +54,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt) haldata->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */ haldata->UsbTxAggMode = 1; - haldata->UsbTxAggDescNum = 0x6; /* only 4 bits */ haldata->UsbRxAggMode = USB_RX_AGG_DMA;/* USB_RX_AGG_DMA; */ haldata->UsbRxAggBlockCount = 8; /* unit : 512b */ @@ -416,7 +415,7 @@ static void usb_AggSettingTxUpdate(struct adapter *Adapter) if (haldata->UsbTxAggMode) { value32 = rtw_read32(Adapter, REG_TDECTRL); value32 = value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT); - value32 |= ((haldata->UsbTxAggDescNum & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_SHIFT); + value32 |= ((USB_TXAGG_DESC_NUM & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_SHIFT); rtw_write32(Adapter, REG_TDECTRL, value32); } diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h index 7a72b564400d..9f4d42c1d24e 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -214,7 +214,6 @@ struct hal_data_8188e { u32 UsbBulkOutSize; u8 UsbTxAggMode; - u8 UsbTxAggDescNum; enum usb_rx_agg_mode UsbRxAggMode; u8 UsbRxAggBlockCount; /* USB Block count. Block size is diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h index f1f2ccfc765e..85eb0aad80d6 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h +++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h @@ -93,6 +93,8 @@ enum TXDESC_SC { #define SGI BIT(6) #define USB_TXAGG_NUM_SHT 24 +#define USB_TXAGG_DESC_NUM 0x6 + #define txdesc_set_ccx_sw_88e(txdesc, value) \ do { \ ((struct txdesc_88e *)(txdesc))->sw1 = (((value)>>8) & 0x0f); \ -- 2.34.1