From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62D412564 for ; Thu, 7 Apr 2022 12:57:52 +0000 (UTC) Received: by mail-ed1-f47.google.com with SMTP id w18so6259989edi.13 for ; Thu, 07 Apr 2022 05:57:52 -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=rVriixE1hFWrvnWyNMXzhhhJoAGwV0Gp7mfloTuErI0=; b=LIT8gkh5Fv+rboebnujcnnCPp9yxRKeoMsaxvL1mt74CZk6/3lZaROVgwB3BmJ+JAy yUhmAjsmh5atl7fZLFpx0waC5SszuPS7luaMeiPuVZHp9Ut4uLPD3V9DsRPrNI0suEhJ F9j+6Wr79uFrfy3hJSG1bHPrN6j/PIgiQEGD7xaXg+ZLZB7m/+2LiZl1ML0fDDMYUoKW ZMpUBJro4pyzlB3lej7YY7rFB+Fgha32gpU+fIvKtBGk+QsSNgpyNnyYjrA2/OytOqmx 4SdM9h9TXz/WMiAnu8ME3a9qi8uztoScI3wtyrH81eRRLbP2kY+SWU0kajig4QKGbljO +f9g== 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=rVriixE1hFWrvnWyNMXzhhhJoAGwV0Gp7mfloTuErI0=; b=xjnPr1J0SyExu6kFy4q3Xcgv5sToqcBz8KKQ/CdgzXHomwnRSze28ufW0GJvEe0LFp xW7/qzksOSHYW7xfhCvs+Usq5rgAfr+6JEND89TIPhjMpXYHPEIWBHV98ZPEzhATqOXe u6ZpB828mxJFARJZQW5D0ZV0zgOjS2J4RmsQSKK+oHdUaSaH3wlWAsiy00nXeli06ZCH ZY6UZtRaAHnIQL/NxmjaTozboE8GlQWIhs7zOJyo/pHZjIYbxOSZzCnxyVuxlgMKsVSA KnSJuMhFPJxhA9rbj1ynZ7TPJbmjvoUCw+OOqwICnUWnXi41LTVOx+ScHFIbWX/BplwC Gx2A== X-Gm-Message-State: AOAM532M1a80kr0d8bZXtFd5i1lx9imx3GTagJylQ4BajyxVLDDEpKLc A/QInMWwcjYSOLjyeRQ5xbI= X-Google-Smtp-Source: ABdhPJz6SjaTr+DSYDiC7jF5NkGZEGFlDseahF8t18TQbSLrDfn+I+hjtWh6/Lxu7H3K+FYWyxYFOg== X-Received: by 2002:a05:6402:1e8a:b0:41a:4242:7de9 with SMTP id f10-20020a0564021e8a00b0041a42427de9mr14069732edf.284.1649336270763; Thu, 07 Apr 2022 05:57:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id n13-20020a170906724d00b006cedd6d7e24sm7676764ejk.119.2022.04.07.05.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Apr 2022 05:57:50 -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 v3 4/5] staging: r8188eu: use round_up() instead of _RND128() Date: Thu, 7 Apr 2022 14:57:41 +0200 Message-Id: <20220407125742.7814-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407125742.7814-1-straube.linux@gmail.com> References: <20220407125742.7814-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use in-kernel round_up() instead of custom _RND128(). Signed-off-by: Michael Straube --- v3: no changes v2: no changes drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 +- drivers/staging/r8188eu/include/osdep_service.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 6a65dcf57112..d5e674542a78 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -287,7 +287,7 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) recvframe_put(precvframe, skb_len); - pkt_offset = (u16)_RND128(pkt_offset); + pkt_offset = (u16)round_up(pkt_offset, 128); if (pattrib->pkt_rpt_type == NORMAL_RX) { /* Normal rx packet */ if (pattrib->physt) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h index ff44c4a37b9d..f6c55f6c9e1a 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -96,14 +96,6 @@ static inline void flush_signals_thread(void) #define _RND(sz, r) ((((sz)+((r)-1))/(r))*(r)) -static inline u32 _RND128(u32 sz) -{ - u32 val; - - val = ((sz >> 7) + ((sz & 127) ? 1: 0)) << 7; - return val; -} - static inline u32 _RND256(u32 sz) { u32 val; -- 2.35.1