From nobody Mon May 11 06:16:11 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 1FD46C433F5 for ; Tue, 12 Apr 2022 18:58:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358918AbiDLTAp (ORCPT ); Tue, 12 Apr 2022 15:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358804AbiDLTAW (ORCPT ); Tue, 12 Apr 2022 15:00:22 -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 B9979443E1 for ; Tue, 12 Apr 2022 11:58:03 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id t11so12186355eju.13 for ; Tue, 12 Apr 2022 11:58:03 -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=lAx29rsGmYrRtuHSy3SVZVdgmsTmcr+upgwDNcDWyIo=; b=d/LLJuopT/ZXleD5Fypemy5GCidPE/yQ3zRgnu/aZKx5k3Klc9MpAZzhask9BMzhBT sCKZoHwr70psALNIRMJvYcTa1SCN/U0W8mR2akyTRHA9nmIQ2XyzdS8PJpRFrilBgWi+ 0gAjsLkDpaSiuFDmDvcUu94KOJpc+cPpWXVimiRWYyC5J7ndkDeDI+rvoKCuyU10g3A/ tI03ffvzjGfvpaZDRgMGtI/z3e+/1RuyQeoFV3FBPLBsXhxOi3/Qdj3fKkRIoxfkuiUU /SgxlzxJhKLCNLGRML1xdqjIgl1Fyb1N9x/X6gSohH1/T/a3WJBi+ROfde2wJgZaVoyI 93VQ== 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=lAx29rsGmYrRtuHSy3SVZVdgmsTmcr+upgwDNcDWyIo=; b=XisTUyXjuZnqjvkl3FdyJaxGzxdl7S3MYISkqoLsGT6VgYYY7gLk2CYvjlKFu/8FaJ vSUsvJ/OCgmNziwgnWLqh1aUGIryKjnQlENKBFocUCsRFrHCsakM7NGxuFFq/cee/DxK 69XMbwhmvlFdpROvjw4MRWz3VCdlAkENPUgbrJs6THRH6JU+88abQTkGU8bY69XlKHio 9MqmuqCuTmqwTXAPr6uRwor47COoemWkdGzwJrDbYs8wjI27DDYmEELrRYn/LaoNE4Jh QvZ/M7W+Hs0Iur3pFJKKSotEJbqRDJ3tOU3X3yvX/BVTcxlgTM8/PTyTuTlRfMEzbvfr Kwzw== X-Gm-Message-State: AOAM530w9MUqEZ9e9d+RPuKop9H2dorzEw9y4wRt6VlGqyzvGYsBwwxF 8wcvAaf+v/sYqFVnB93K3bM= X-Google-Smtp-Source: ABdhPJyl2n5ClHnRWbhDGJ7VenGf6szL1MzoI3o26vEmOqEjj4TfphLwUj6MYAqpfNuQ1Z/YAJ2rpw== X-Received: by 2002:a17:907:7242:b0:6da:b561:d523 with SMTP id ds2-20020a170907724200b006dab561d523mr34491209ejc.118.1649789882375; Tue, 12 Apr 2022 11:58:02 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id q22-20020a170906771600b006cf8a37ebf5sm13443482ejm.103.2022.04.12.11.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:58:01 -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/6] staging: r8188eu: correct macro spelling mistake Date: Tue, 12 Apr 2022 20:57:49 +0200 Message-Id: <20220412185754.8695-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412185754.8695-1-straube.linux@gmail.com> References: <20220412185754.8695-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" Correct a macro spelling mistake in rtw_fw.c. MAX_REG_BOLCK_SIZE -> MAX_REG_BLOCK_SIZE Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 7a0997b9bac5..0905384bafc7 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -4,7 +4,7 @@ #include #include "../include/rtw_fw.h" =20 -#define MAX_REG_BOLCK_SIZE 196 +#define MAX_REG_BLOCK_SIZE 196 #define FW_8188E_START_ADDRESS 0x1000 #define MAX_PAGE_SIZE 4096 =20 @@ -82,7 +82,7 @@ static int block_write(struct adapter *padapter, void *bu= ffer, u32 buffSize) u8 *bufferPtr =3D (u8 *)buffer; u32 i =3D 0, offset =3D 0; =20 - blockSize_p1 =3D MAX_REG_BOLCK_SIZE; + blockSize_p1 =3D MAX_REG_BLOCK_SIZE; =20 /* 3 Phase #1 */ blockCount_p1 =3D buffSize / blockSize_p1; --=20 2.35.1 From nobody Mon May 11 06:16:11 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 7D9ACC433EF for ; Tue, 12 Apr 2022 18:58:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358872AbiDLTAk (ORCPT ); Tue, 12 Apr 2022 15:00:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358808AbiDLTAX (ORCPT ); Tue, 12 Apr 2022 15:00:23 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8953C49CBE for ; Tue, 12 Apr 2022 11:58:04 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id r13so39197628ejd.5 for ; Tue, 12 Apr 2022 11:58:04 -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=EMAct/S8PjX9QPpz0Ylic0owxKculFndXWjJh1Wp6MA=; b=D45J6e1pF1z1CQu/h0fcwxA/V3UGywEx3PmOrTzAFdcgyPnHrkMofGu9jBLwnFIhKl qIbQXdZu9bt7yU2jlVwd5O2nFhxTtRnwUBUMP6nZzoRVUgOFfDXlq5uAUOeS8rCl8ZqO VtEpV4Cr6+USSVICKIFEYFgvcRQlZTHsiSvvKM0rsntua3Zw9II1mGWrSlidtgTXisDi KKNsurhDuwAHD8CbMhvjWTGugCfKj249RnTThHr7z2emuTQFN9LflrXPmvunjSgfXaKI fJgXAQHoDt5sLWrQAZcWsbnibDZXXnn8qrFKLtLO9V/MrpjLaCAZQC9PFybTfLjFO2Y1 GRcg== 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=EMAct/S8PjX9QPpz0Ylic0owxKculFndXWjJh1Wp6MA=; b=cpsVtt+DxPtmFHABHPK0UJVc/rB/dTkaLg/f38PNv6sQUXptfPPBtHKFg3BZJhhh3n yy2OlngYVo9frO7I92AcmECw8jbM6mFg5DwhwAjNdae/WJy/DDMQY3vJNiFljEhal/Z+ Jgxh2aLCWnepxvjUoEId7dEEBgxqpdJoRhClO1ZhOkdRfgYPrSAqDVKpfK0g3IKlPf3O PFXEpIFyjriLbR06Pz9op/VBmAdo+jZptnCv6YSEqA7xOOsz3tm9/e1kfapAMpRXCiPv hjTP84He6NzDS6mAzO1iTLHq3IKo+OVG3gDipGrfPGmciz9sLsSNGwf6HhjxfKaaCTE+ lhPg== X-Gm-Message-State: AOAM531kAZHPc7Iy2qt3mNEdQfjYBJ4RtZUxhu4wmsGEsCdjFSM//pqq 6ay63qJKDX4wJ+owMoquFGY= X-Google-Smtp-Source: ABdhPJyUq5S/ZdO2cE9v0nrsQtQMhDmUvC0XzovmvV2ElN2HNG8I3o5UpPmS34ChyfTA6OltKS8qAw== X-Received: by 2002:a17:907:7ea2:b0:6e8:92eb:3893 with SMTP id qb34-20020a1709077ea200b006e892eb3893mr10359148ejc.350.1649789883136; Tue, 12 Apr 2022 11:58:03 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id q22-20020a170906771600b006cf8a37ebf5sm13443482ejm.103.2022.04.12.11.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:58:02 -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/6] staging: r8188eu: rename parameter of block_write() Date: Tue, 12 Apr 2022 20:57:50 +0200 Message-Id: <20220412185754.8695-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412185754.8695-1-straube.linux@gmail.com> References: <20220412185754.8695-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" Rename the parameter buffSize of block_write() to avoid camel case. buffSize -> size Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 0905384bafc7..5f59acfd8b5d 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -71,7 +71,7 @@ static void fw_download_enable(struct adapter *padapter, = bool enable) } } =20 -static int block_write(struct adapter *padapter, void *buffer, u32 buffSiz= e) +static int block_write(struct adapter *padapter, void *buffer, u32 size) { int ret =3D _SUCCESS; u32 blockSize_p1 =3D 4; /* (Default) Phase #1 : PCI muse use 4-byte writ= e to download FW */ @@ -85,8 +85,8 @@ static int block_write(struct adapter *padapter, void *bu= ffer, u32 buffSize) blockSize_p1 =3D MAX_REG_BLOCK_SIZE; =20 /* 3 Phase #1 */ - blockCount_p1 =3D buffSize / blockSize_p1; - remainSize_p1 =3D buffSize % blockSize_p1; + blockCount_p1 =3D size / blockSize_p1; + remainSize_p1 =3D size % blockSize_p1; =20 for (i =3D 0; i < blockCount_p1; i++) { ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * blockSize_p1)= , blockSize_p1, (bufferPtr + i * blockSize_p1)); --=20 2.35.1 From nobody Mon May 11 06:16:11 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 BC864C433EF for ; Tue, 12 Apr 2022 18:58:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229835AbiDLTAi (ORCPT ); Tue, 12 Apr 2022 15:00:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358812AbiDLTAX (ORCPT ); Tue, 12 Apr 2022 15:00:23 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DAB34B871 for ; Tue, 12 Apr 2022 11:58:05 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id u18so12806568eda.3 for ; Tue, 12 Apr 2022 11:58:05 -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=P83BpPosTwKlH7SaIyI97o8/90EHDJt3E+4hDWW/yXg=; b=iAVLcdBHQNnx/Tw+la/1EVMwd3ENyyk43q3x/W0681+7OR6tYYnTMYb1qOCo71cJbx 3q0xtFXBujVeuJeUdyCvbe/lKsGwGglZF/E+zKcCEVujwnCKyw/iGRfxYp9ep19X1L8U 7APv12fBuoX5jX80594NPXmX5YAvEZTxJ6KeoQ33cHv09E3bRy6llG8JpD9FyKZeTt4n 2gmfhMRH5J01qD22uSR8Gfsp/dQE5xQtcwJ3EKAXs8tvKv3STdeY8Y4pow+c6qe7BvxP 6hzC/xgZwe8jOJtXcnTsF6cjG6Elmzoe3pZ4RI8mA5Ct0sCRWearU/7K7tnXB7NIQTA/ 03gA== 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=P83BpPosTwKlH7SaIyI97o8/90EHDJt3E+4hDWW/yXg=; b=AFzf3zfOuPzBgxmqxaNMBa/ofMNh2heyNTa5LSFHh+vmEDx0/NrSjh7sNsOU8hJjoQ 6/6mZ5fMoyXL19M0XB4FyZ2yDs8W7qvYQXAL4MypKqZoKtyWFHawgZLzy4FFxdW25lrt mzWrBvXcWLfG1vl5nlaBM7d+IFTxvCeuQVZ8zoc5UxWg0QH1k6TQN8koMIujYvVygnKW FoXM2y/5VerXAsGaXVDHWInWHTm1VUztbJTb4H+j0GMw/Bp/xYAXeJh23d3k3Pb2ps0e DoK6qEAlJyQi63V25KP4H+ju+Z5RV1S43teHZcMX/sKt72kmOzQdTjYa26Xzn7EmHfM9 Fylw== X-Gm-Message-State: AOAM530N4MtceJLFHimb0OeGhGvshl0Qx4+EOQL0SGzISCHkXIjrE5NV bvGU278A/CcJAMVdSs/8Rd+j7B28WXY= X-Google-Smtp-Source: ABdhPJxoZUoGuosYL2+S8ZIvCyaA5aUdc3/mzJZUGnzbijUSjmCMQhEGx46Pjea0oH8CxXu2A1UhQQ== X-Received: by 2002:aa7:cb93:0:b0:415:d57a:4603 with SMTP id r19-20020aa7cb93000000b00415d57a4603mr39865733edt.62.1649789883857; Tue, 12 Apr 2022 11:58:03 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id q22-20020a170906771600b006cf8a37ebf5sm13443482ejm.103.2022.04.12.11.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:58:03 -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/6] staging: r8188eu: change void parameters to u8 Date: Tue, 12 Apr 2022 20:57:51 +0200 Message-Id: <20220412185754.8695-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412185754.8695-1-straube.linux@gmail.com> References: <20220412185754.8695-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 second parameter of write_fw(), page_write() and block_write() is a void pointer, but we always pass an u8 pointer. We can convert this parameter to an u8 pointer. The pointer is not changed in the functions, so we can safely remove the local variable bufferPtr. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 5f59acfd8b5d..3cea4e41ab13 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -71,7 +71,7 @@ static void fw_download_enable(struct adapter *padapter, = bool enable) } } =20 -static int block_write(struct adapter *padapter, void *buffer, u32 size) +static int block_write(struct adapter *padapter, u8 *buffer, u32 size) { int ret =3D _SUCCESS; u32 blockSize_p1 =3D 4; /* (Default) Phase #1 : PCI muse use 4-byte writ= e to download FW */ @@ -79,7 +79,6 @@ static int block_write(struct adapter *padapter, void *bu= ffer, u32 size) u32 blockSize_p3 =3D 1; /* Phase #3 : Use 1-byte, the remnant of FW imag= e. */ u32 blockCount_p1 =3D 0, blockCount_p2 =3D 0, blockCount_p3 =3D 0; u32 remainSize_p1 =3D 0, remainSize_p2 =3D 0; - u8 *bufferPtr =3D (u8 *)buffer; u32 i =3D 0, offset =3D 0; =20 blockSize_p1 =3D MAX_REG_BLOCK_SIZE; @@ -89,7 +88,7 @@ static int block_write(struct adapter *padapter, void *bu= ffer, u32 size) remainSize_p1 =3D size % blockSize_p1; =20 for (i =3D 0; i < blockCount_p1; i++) { - ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * blockSize_p1)= , blockSize_p1, (bufferPtr + i * blockSize_p1)); + ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * blockSize_p1)= , blockSize_p1, (buffer + i * blockSize_p1)); if (ret =3D=3D _FAIL) goto exit; } @@ -102,7 +101,7 @@ static int block_write(struct adapter *padapter, void *= buffer, u32 size) remainSize_p2 =3D remainSize_p1 % blockSize_p2; =20 for (i =3D 0; i < blockCount_p2; i++) { - ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + offset + i * blo= ckSize_p2), blockSize_p2, (bufferPtr + offset + i * blockSize_p2)); + ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + offset + i * blo= ckSize_p2), blockSize_p2, (buffer + offset + i * blockSize_p2)); =20 if (ret =3D=3D _FAIL) goto exit; @@ -116,7 +115,7 @@ static int block_write(struct adapter *padapter, void *= buffer, u32 size) blockCount_p3 =3D remainSize_p2 / blockSize_p3; =20 for (i =3D 0; i < blockCount_p3; i++) { - ret =3D rtw_write8(padapter, (FW_8188E_START_ADDRESS + offset + i), *(b= ufferPtr + offset + i)); + ret =3D rtw_write8(padapter, (FW_8188E_START_ADDRESS + offset + i), *(b= uffer + offset + i)); =20 if (ret =3D=3D _FAIL) goto exit; @@ -127,7 +126,7 @@ static int block_write(struct adapter *padapter, void *= buffer, u32 size) return ret; } =20 -static int page_write(struct adapter *padapter, u32 page, void *buffer, u3= 2 size) +static int page_write(struct adapter *padapter, u32 page, u8 *buffer, u32 = size) { u8 value8; u8 u8Page =3D (u8)(page & 0x07); @@ -138,21 +137,20 @@ static int page_write(struct adapter *padapter, u32 p= age, void *buffer, u32 size return block_write(padapter, buffer, size); } =20 -static int write_fw(struct adapter *padapter, void *buffer, u32 size) +static int write_fw(struct adapter *padapter, u8 *buffer, u32 size) { /* Since we need dynamic decide method of dwonload fw, so we call this f= unction to get chip version. */ /* We can remove _ReadChipVersion from ReadpadapterInfo8192C later. */ int ret =3D _SUCCESS; u32 pageNums, remainSize; u32 page, offset; - u8 *bufferPtr =3D (u8 *)buffer; =20 pageNums =3D size / MAX_PAGE_SIZE; remainSize =3D size % MAX_PAGE_SIZE; =20 for (page =3D 0; page < pageNums; page++) { offset =3D page * MAX_PAGE_SIZE; - ret =3D page_write(padapter, page, bufferPtr + offset, MAX_PAGE_SIZE); + ret =3D page_write(padapter, page, buffer + offset, MAX_PAGE_SIZE); =20 if (ret =3D=3D _FAIL) goto exit; @@ -160,7 +158,7 @@ static int write_fw(struct adapter *padapter, void *buf= fer, u32 size) if (remainSize) { offset =3D pageNums * MAX_PAGE_SIZE; page =3D pageNums; - ret =3D page_write(padapter, page, bufferPtr + offset, remainSize); + ret =3D page_write(padapter, page, buffer + offset, remainSize); =20 if (ret =3D=3D _FAIL) goto exit; --=20 2.35.1 From nobody Mon May 11 06:16:11 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 3B9C3C433EF for ; Tue, 12 Apr 2022 18:58:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358908AbiDLTBJ (ORCPT ); Tue, 12 Apr 2022 15:01:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358819AbiDLTAY (ORCPT ); Tue, 12 Apr 2022 15:00:24 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F21734C790 for ; Tue, 12 Apr 2022 11:58:05 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id p15so39151485ejc.7 for ; Tue, 12 Apr 2022 11:58:05 -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=0DvvGyyTAhUrGmw9SU82p+PyQ16OeZEs2v/UZsOf+ig=; b=Lf3wBfHlGcpJEIkvlyDzvWIMzmkSxJ72dchDveMBA16ZhoSUGNMV0NDM29nKyVzN+n ijRe4lYj8gPUTIfYT9Zzl7CWEwx/NLnnXzM5GgrdJOKwG9xWZbc8hk5qVI7F2r57Bu9l jpmIeAkGWXfG90/3Yv5h4gkSQutf4VA8uuSI3pDth0yeglsebHmgl97ZGS+a9M6dsyEV eu+99nP2jD4N0n7xu3/hNMWpvkUZEBkNFphmv7pLsnFs+RvIaE2O/Ib+UJDqAapggSgW vS+musv03qEkS5/xMjl7nFyRDYupByQPHtHx+cPgg/C+B/cNOQ+4TatGcIfikFzLbF6u RBSw== 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=0DvvGyyTAhUrGmw9SU82p+PyQ16OeZEs2v/UZsOf+ig=; b=RDizJfIH6E4n9+K8obk2HVv3OVQdz03BYR+LNoleKQFXEQyjuxDCKQbJmrxtEnLLSh qQO4xnz3PReB67en8PxwQP8icucH/Owfy0AxpDbnH/gvNOWYyfU9coJgV/07LrPz2bSe ZT4DE4d3gF7BluA58h+xFDguMfP3QyQNcuSEBLIM1u3mfia8LQzjFReUiVYoBCPN+iAU gFNrTATYoesKZArIEDMcZcfxx1cxKpIOe1E+wU/bDRYwraP83AGJBhndwAg4TjmRc5hK AuCcc69pd3W4nOX2GAFmLlLQ4H7RZfzrFVFw/k4KwxXK4hatmxWcOWxnBlazYORNhs2s UXZg== X-Gm-Message-State: AOAM5311FRrwNq2mxv7Cg6UmnYXcHPDAkzWLlsPEqaIlmbYTHOpdp38q 6W96yxhxQ7ciTfA3yRgONBg= X-Google-Smtp-Source: ABdhPJze3T0Yyj+kvM5Ad2BP4neIXA9XzxUdinMLLQ2K9KROMPh5IFmM7Gp73mjGs3bVxb3rwJSLwg== X-Received: by 2002:a17:907:968e:b0:6db:aed5:43c8 with SMTP id hd14-20020a170907968e00b006dbaed543c8mr36178503ejc.636.1649789884555; Tue, 12 Apr 2022 11:58:04 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id q22-20020a170906771600b006cf8a37ebf5sm13443482ejm.103.2022.04.12.11.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:58:04 -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/6] staging: r8188eu: reduce variables in block_write() Date: Tue, 12 Apr 2022 20:57:52 +0200 Message-Id: <20220412185754.8695-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412185754.8695-1-straube.linux@gmail.com> References: <20220412185754.8695-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" For cleaner code and improved readability we can reduce the number of local variables in block_write(). Use a single variable for block size, number of blocks and remaining size. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 43 +++++++++++---------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 3cea4e41ab13..b4ab050a6f23 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -74,49 +74,42 @@ static void fw_download_enable(struct adapter *padapter= , bool enable) static int block_write(struct adapter *padapter, u8 *buffer, u32 size) { int ret =3D _SUCCESS; - u32 blockSize_p1 =3D 4; /* (Default) Phase #1 : PCI muse use 4-byte writ= e to download FW */ - u32 blockSize_p2 =3D 8; /* Phase #2 : Use 8-byte, if Phase#1 use big siz= e to write FW. */ - u32 blockSize_p3 =3D 1; /* Phase #3 : Use 1-byte, the remnant of FW imag= e. */ - u32 blockCount_p1 =3D 0, blockCount_p2 =3D 0, blockCount_p3 =3D 0; - u32 remainSize_p1 =3D 0, remainSize_p2 =3D 0; + u32 blocks, block_size, remain; u32 i =3D 0, offset =3D 0; =20 - blockSize_p1 =3D MAX_REG_BLOCK_SIZE; + block_size =3D MAX_REG_BLOCK_SIZE; =20 - /* 3 Phase #1 */ - blockCount_p1 =3D size / blockSize_p1; - remainSize_p1 =3D size % blockSize_p1; + blocks =3D size / block_size; + remain =3D size % block_size; =20 - for (i =3D 0; i < blockCount_p1; i++) { - ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * blockSize_p1)= , blockSize_p1, (buffer + i * blockSize_p1)); + for (i =3D 0; i < blocks; i++) { + ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * block_size), = block_size, (buffer + i * block_size)); if (ret =3D=3D _FAIL) goto exit; } =20 - /* 3 Phase #2 */ - if (remainSize_p1) { - offset =3D blockCount_p1 * blockSize_p1; + if (remain) { + offset =3D blocks * block_size; + block_size =3D 8; =20 - blockCount_p2 =3D remainSize_p1 / blockSize_p2; - remainSize_p2 =3D remainSize_p1 % blockSize_p2; - - for (i =3D 0; i < blockCount_p2; i++) { - ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + offset + i * blo= ckSize_p2), blockSize_p2, (buffer + offset + i * blockSize_p2)); + blocks =3D remain / block_size; + remain =3D remain % block_size; =20 + for (i =3D 0; i < blocks; i++) { + ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + offset + i * blo= ck_size), block_size, (buffer + offset + i * block_size)); if (ret =3D=3D _FAIL) goto exit; } } =20 - /* 3 Phase #3 */ - if (remainSize_p2) { - offset =3D (blockCount_p1 * blockSize_p1) + (blockCount_p2 * blockSize_p= 2); + if (remain) { + offset +=3D blocks * block_size; =20 - blockCount_p3 =3D remainSize_p2 / blockSize_p3; + /* block size 1 */ + blocks =3D remain; =20 - for (i =3D 0; i < blockCount_p3; i++) { + for (i =3D 0; i < blocks; i++) { ret =3D rtw_write8(padapter, (FW_8188E_START_ADDRESS + offset + i), *(b= uffer + offset + i)); - if (ret =3D=3D _FAIL) goto exit; } --=20 2.35.1 From nobody Mon May 11 06:16:11 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 A1047C433EF for ; Tue, 12 Apr 2022 18:58:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358921AbiDLTBL (ORCPT ); Tue, 12 Apr 2022 15:01:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358800AbiDLTAY (ORCPT ); Tue, 12 Apr 2022 15:00:24 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9CB843AD5 for ; Tue, 12 Apr 2022 11:58:06 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id 21so10293199edv.1 for ; Tue, 12 Apr 2022 11:58:06 -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=BsWsL39ltA1wTpv8W1hqbPPmQmDEyFgKV3mcaWzu08c=; b=deKENVLfFRR1fSZcs4ZiGvcW7ukzwIj8EfVX9z37LnXJPhxKNy3FxGIe6CQWbppQIZ aUtXjcAGORu3rS41d0DFthdls3+R9BXfOayU3ZVY6alx9It4b/1sA/9Q8sW/dkT/rJ2G 9Ao5L5yysnSmKppJdLi3k8ZhAwWiJpjpgdWOPVfMgdGFaSfqQopk/Y1WJTZxPxt2ZDP8 MaY0YsabmrGjtB+Q8UuEbY+n+gncLmW/+aa4camFgK4cnumJYM+U9/uWC6sRAa64MIhh Ls8lSPJ+3GTpzD1LHjG9g3DZMpo2nd7Y4COzsHpA4iu3dV0ji96ME61a5RJRK5Ze1E0Q q6QA== 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=BsWsL39ltA1wTpv8W1hqbPPmQmDEyFgKV3mcaWzu08c=; b=s1kemyzJhBEN5ZdlL+Pv6aKMhOp/oSi0YGVdTHRkIQNkIOMq0MeThEyFtV5tcHDSLB siI4E+cyVEsfMxK1VwF3UoxAsVzzu+0fj3Tc51cuLa5SWCiM40myGCkuGXM+6U6mbO4i 9AigvzHrYAxVX25qnFqUKp0SlVeMOlcqCh4G2Aj6lCxlWvtTwq0zhPRW1IV9oauPD6yd 0yESmrs8DwTMlYIswcegtB8SGZD6qy1VPzL/X4ySZ1oEqatTyS7dJ4bWdQ9X7418/uOe fZltedlS2SNb02h7bIf5xQNY0gcNTEJK6h+aTgdcdG4FkN3GnIqOJMbpV0KNKyGoUlC1 +EZQ== X-Gm-Message-State: AOAM531QgS3REMdH1TI8QqoVUaig4qJAWSn7JUbJl5edCpMOqvGbhpq0 oOt8Rwg3czyKQ+ZLSgLG3GE= X-Google-Smtp-Source: ABdhPJxvfzcTLZbNQM0pkZ2JE75eq79nLgBBh5wlxm3gTixrxFK/X6sdt7LCtKYa6G2Wc4lkwKqYGA== X-Received: by 2002:aa7:d494:0:b0:41d:704f:7718 with SMTP id b20-20020aa7d494000000b0041d704f7718mr17595132edr.147.1649789885302; Tue, 12 Apr 2022 11:58:05 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id q22-20020a170906771600b006cf8a37ebf5sm13443482ejm.103.2022.04.12.11.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:58:04 -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/6] staging: r8188eu: remove unneeded initializations Date: Tue, 12 Apr 2022 20:57:53 +0200 Message-Id: <20220412185754.8695-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412185754.8695-1-straube.linux@gmail.com> References: <20220412185754.8695-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 variables i and offset in block_write() are set in the code before they are used. Remove the unneeded initializations. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index b4ab050a6f23..1e930799a0b3 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -75,7 +75,7 @@ static int block_write(struct adapter *padapter, u8 *buff= er, u32 size) { int ret =3D _SUCCESS; u32 blocks, block_size, remain; - u32 i =3D 0, offset =3D 0; + u32 i, offset; =20 block_size =3D MAX_REG_BLOCK_SIZE; =20 --=20 2.35.1 From nobody Mon May 11 06:16:11 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 35C91C433EF for ; Tue, 12 Apr 2022 18:59:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358852AbiDLTBQ (ORCPT ); Tue, 12 Apr 2022 15:01:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358825AbiDLTAZ (ORCPT ); Tue, 12 Apr 2022 15:00:25 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A68D4BFD8 for ; Tue, 12 Apr 2022 11:58:07 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id c6so8353909edn.8 for ; Tue, 12 Apr 2022 11:58:07 -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=hpa4N5vsb9gM4LzFPyO/7ve7HdAU0SOf4yN5lG8PbWY=; b=HgVZUoTC+gx8PCPFFLnAywUZ8CUoq5mmDC3QTucWlg1VezUrWG0GdIhCuBtFLv8tyl VEQDO3GSP4ox2p1SUPDaMmoPvV6L9nBPTvZEQI03+2UY4VYL62fC+Fo3VOqOzrnDJiQl UOwhXzAQQAtkHZzeGIAtrEfJRLZEY0aQyPa4u134U3tWNgEV1/I2JLuOjwj+y08VmnyN mPJpPc4wCZiIMrTOkWXj8wDZ3VEjGdYEj+upacu0akQ0ZXB3lwb1HBN9vVVqNat57DpJ jGEbFk9l0FA+tN3qS9x6gAb/s70vTP2j/7nKwGxhMcE/3oKzNLxWpK+Wzc8uEJFhf0k8 vFeQ== 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=hpa4N5vsb9gM4LzFPyO/7ve7HdAU0SOf4yN5lG8PbWY=; b=XdLlbYBS5esXn/elg49KjIssocd4oSYSjIzSw0BkPCW67fGBV+OffeEYiXRUpYDJfZ sNc6iQIhkCXd7sswyVREysLxrhZVa5ZSpSKCEqy0GtvP0bBvNgkRiPVAsMC2h2+2pAF5 4ejhSkR/NNJOqQmjgYib0lHNG9MsTJZhDuIwWpPVxTyxwIazNEk6kq6JERGESXzegWlr YgZ8UHHBhojW4XZNr8rWExwH0Hzht6enY/3YZHJjNM+IVsqzDs3yHmTv7qdHDML1zjzQ vsu1wdz+QHIxbRTgGWGS5PIKrSae+Q+I8f/8dVzEizclPYBozDE4AUEP65uTLX+QkHfj 0zcg== X-Gm-Message-State: AOAM532XanRHijeckPDZaENhdERFCKehN+mpCjgKxBhgEhaYe33FewRk RZ76sOEYMuThJhy9ob1mKUg= X-Google-Smtp-Source: ABdhPJxfSkH/23aJHVUbzKtMu+PEFUbtRkCS3kd4XoG51Dtd6o0rHViRyN1QxNgGj6jVF+kgF4Lm1Q== X-Received: by 2002:a05:6402:cac:b0:410:a920:4e90 with SMTP id cn12-20020a0564020cac00b00410a9204e90mr39599935edb.60.1649789886129; Tue, 12 Apr 2022 11:58:06 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id q22-20020a170906771600b006cf8a37ebf5sm13443482ejm.103.2022.04.12.11.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:58:05 -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/6] staging: r8188eu: clean up long lines in block_write() Date: Tue, 12 Apr 2022 20:57:54 +0200 Message-Id: <20220412185754.8695-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412185754.8695-1-straube.linux@gmail.com> References: <20220412185754.8695-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" Store the address and the data pointer for calls to rtw_writeN() and rtw_write8() in local variables. This avoids long lines and improves readability. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 1e930799a0b3..8620f3c92b52 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -75,7 +75,8 @@ static int block_write(struct adapter *padapter, u8 *buff= er, u32 size) { int ret =3D _SUCCESS; u32 blocks, block_size, remain; - u32 i, offset; + u32 i, offset, addr; + u8 *data; =20 block_size =3D MAX_REG_BLOCK_SIZE; =20 @@ -83,7 +84,10 @@ static int block_write(struct adapter *padapter, u8 *buf= fer, u32 size) remain =3D size % block_size; =20 for (i =3D 0; i < blocks; i++) { - ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * block_size), = block_size, (buffer + i * block_size)); + addr =3D FW_8188E_START_ADDRESS + i * block_size; + data =3D buffer + i * block_size; + + ret =3D rtw_writeN(padapter, addr, block_size, data); if (ret =3D=3D _FAIL) goto exit; } @@ -96,7 +100,10 @@ static int block_write(struct adapter *padapter, u8 *bu= ffer, u32 size) remain =3D remain % block_size; =20 for (i =3D 0; i < blocks; i++) { - ret =3D rtw_writeN(padapter, (FW_8188E_START_ADDRESS + offset + i * blo= ck_size), block_size, (buffer + offset + i * block_size)); + addr =3D FW_8188E_START_ADDRESS + offset + i * block_size; + data =3D buffer + offset + i * block_size; + + ret =3D rtw_writeN(padapter, addr, block_size, data); if (ret =3D=3D _FAIL) goto exit; } @@ -109,7 +116,10 @@ static int block_write(struct adapter *padapter, u8 *b= uffer, u32 size) blocks =3D remain; =20 for (i =3D 0; i < blocks; i++) { - ret =3D rtw_write8(padapter, (FW_8188E_START_ADDRESS + offset + i), *(b= uffer + offset + i)); + addr =3D FW_8188E_START_ADDRESS + offset + i; + data =3D buffer + offset + i; + + ret =3D rtw_write8(padapter, addr, *data); if (ret =3D=3D _FAIL) goto exit; } --=20 2.35.1