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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41BC4C4338F for ; Tue, 3 Aug 2021 13:53:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 277C360E78 for ; Tue, 3 Aug 2021 13:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236494AbhHCNxz (ORCPT ); Tue, 3 Aug 2021 09:53:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236405AbhHCNw6 (ORCPT ); Tue, 3 Aug 2021 09:52:58 -0400 Received: from mail-oo1-xc2b.google.com (mail-oo1-xc2b.google.com [IPv6:2607:f8b0:4864:20::c2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DFEFC061798 for ; Tue, 3 Aug 2021 06:52:46 -0700 (PDT) Received: by mail-oo1-xc2b.google.com with SMTP id y11-20020a4ade0b0000b029024b4146e2f5so5207716oot.1 for ; Tue, 03 Aug 2021 06:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PVmYRiU+rLASZ08i0ZQHsqvZPCSQrNJBkub0LVsh2Io=; b=fCxssyIEXbFBEvk1gDhZz9TzBoNFVZw8WWiCA+hk4+6f3Fh4K44xe5xzzRZoOmZY6s ux2m9QT1Xv6m5g9AD6dnfw+SvVuGWJSfnqJ2atfjNdQN/Q93rn5n4KeMByZF8zQNJ9pk b93O3RD0zaynuf1y72JG1atYuFDCAv55aRQhdTFX8c+WFncFV1oD6d/K9POZ5HAWtt8d 1cTiwQlsHe9nbNF7IssjUGzOeLDX0dWyFLSuUYlrMYjXTr4vBYUwhHGXy6IcSwRsYnF0 yDfvLC9obniqkfIzEZou/bShKG8nIEF+KGhpcv0lA2tf2RB4aB1gTXGUlVlmmJi06ci4 SKUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PVmYRiU+rLASZ08i0ZQHsqvZPCSQrNJBkub0LVsh2Io=; b=qzfHhQ9m2ryfIatW2VVaXeiOSW5dIbzBxxi4OWWXyUYdKLPKJOR9+Uxg8lrxexnGNm eOI+aPRA+TLdWpEwVz4l/CBzUsKhEzYY/iKO7UwReIM65ayKdT+XYcFE10aCgWrinTUp OwHETRj8Jw71noQIq7/+SReDWVjb5P4QBwcHn7KNoxD38J0IGhcppXpT0v+ij/PKVtLr mj9c4IOIs7T+RNqhbrd9oW8OpiE4Yo2wIZ91j95b+xw7qgFMR7vO3oCsXITggD2j71Ng sasf8XvyPD5RKMP2E40GjWE0IFgccNtVSnqqRBfbx6KmFHWYR9mTM6Sj5wDK0pKwmQeY GmFg== X-Gm-Message-State: AOAM5303mwmCyoyY/nc8xUuz/95tMt6jt/zYq9V9yiLmPQ/YxQnz/+UO irarNwEGda2wrnRvnb2HQm8= X-Google-Smtp-Source: ABdhPJwliS0HE3ZXN6dcD0h4c96jB8hMyLoI346NeiYNz+EGF9akgcoFabf3oJB8/p8kqLVMB6lQZA== X-Received: by 2002:a4a:2242:: with SMTP id z2mr14320002ooe.90.1627998765789; Tue, 03 Aug 2021 06:52:45 -0700 (PDT) Received: from 2603-8090-2005-39b3-0000-0000-0000-1010.res6.spectrum.com.com (2603-8090-2005-39b3-0000-0000-0000-1010.res6.spectrum.com. [2603:8090:2005:39b3::1010]) by smtp.gmail.com with ESMTPSA id y26sm2504106otq.23.2021.08.03.06.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 06:52:45 -0700 (PDT) Sender: Larry Finger From: Larry Finger To: gregkh@linuxfoundation.org Cc: phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Larry Finger Subject: [PATCH 08/10] staging: r8188eu: Remove wrapper around do_div Date: Tue, 3 Aug 2021 08:52:21 -0500 Message-Id: <20210803135223.12543-9-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210803135223.12543-1-Larry.Finger@lwfinger.net> References: <20210803135223.12543-1-Larry.Finger@lwfinger.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Wrapper routine rtw_modular64() contains only a call to do_div() and is used once in the code. Remove the wrapper. Signed-off-by: Larry Finger --- drivers/staging/r8188eu/hal/usb_halinit.c | 3 ++- drivers/staging/r8188eu/include/osdep_service.h | 2 -- drivers/staging/r8188eu/os_dep/osdep_service.c | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 441080bd0b74..0d945a3bb1d7 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1453,7 +1453,8 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - tsf = pmlmeext->TSFValue - rtw_modular64(pmlmeext->TSFValue, (pmlmeinfo->bcn_interval*1024)) - 1024; /* us */ + tsf = pmlmeext->TSFValue - do_div(pmlmeext->TSFValue, + pmlmeinfo->bcn_interval * 1024) - 1024; /* us */ if (((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) || ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)) StopTxBeacon(Adapter); diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/staging/r8188eu/include/osdep_service.h index 6203e3c219ca..52862785647f 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -344,8 +344,6 @@ void rtw_free_netdev(struct net_device *netdev); #define rtw_signal_process(pid, sig) kill_pid(find_vpid((pid)),(sig), 1) -u64 rtw_modular64(u64 x, u64 y); - /* Macros for handling unaligned memory accesses */ #define RTW_GET_BE16(a) ((u16) (((a)[0] << 8) | (a)[1])) diff --git a/drivers/staging/r8188eu/os_dep/osdep_service.c b/drivers/staging/r8188eu/os_dep/osdep_service.c index c05b7589e9b4..f2fae1c7f147 100644 --- a/drivers/staging/r8188eu/os_dep/osdep_service.c +++ b/drivers/staging/r8188eu/os_dep/osdep_service.c @@ -283,11 +283,6 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname) return -1; } -u64 rtw_modular64(u64 x, u64 y) -{ - return do_div(x, y); -} - void rtw_buf_free(u8 **buf, u32 *buf_len) { *buf_len = 0; -- 2.32.0