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 DF4C5C433F5 for ; Sun, 30 Jan 2022 19:04:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355874AbiA3TEV (ORCPT ); Sun, 30 Jan 2022 14:04:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355714AbiA3TDn (ORCPT ); Sun, 30 Jan 2022 14:03:43 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F20FC061741 for ; Sun, 30 Jan 2022 11:03:42 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id s13so36157757ejy.3 for ; Sun, 30 Jan 2022 11:03:42 -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=EBu/VgNr1P+8NOJbgZCzoP/cKUO7qZPe/m2OUsi2OqM=; b=SjcWhj7kEPfEDOFP2yv4cpBrfFZOAW8h+eozWkFGu+NqghG4Hq9FlI9Q+3wsl3XxPU bbEOiIii7LtFtPvy+mRTH6/6ykVuMPwIWQXpbWyKoS0fi1jNpMpOQPzleqoDLo7lveO5 i6Q/AxTEtB6OfMCWceDqgdgN5GDkfComStlgmmN7yM9aVuf/nxEKWkG6NMoNG8ATeGu3 uIh+45w22lSbRQBIRgNwonUyhF7F2T9vbbr1RxMVPONe+hpoHIgH03hOzgAV1NSWsxKt tx9cZCnKc5r47huUoAQDYDCh4uyt/mT22hY4Rz9K613r+NprxQL2POO9C5lSXyWHCccD ZpUw== 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=EBu/VgNr1P+8NOJbgZCzoP/cKUO7qZPe/m2OUsi2OqM=; b=JOFkR92S34hFqUFkFwqOAiaeGqr5i+9i8zZkD6NsP9/q5VeCmh/CII0ddTOsTPzo5l eTIQaxWq3T/Fo/AaE2X7ble+Y4p9mLfghiYOCMT/ac6wkDt1XDGJkYyxj7c6vkJ0ODwl GS8FM29fYt6F4ccSKI5cqLjgHUddYFn6ZSCLP1NPXCM/AoHXsqlxMmXIjGlk9pqz38/X RBvbRRjLWTXVjCm8jYDlaSFo6yI8i41MdHJajcAXh7OaMdvLMC7LKN44ouP//LDgvtaP g7O7xS+cuoOoZWa8/5ykWSmy2kPeqILkHFj9VQq3NmedCvUn6pq+p/LRn9vwOEhpWH5g xsrQ== X-Gm-Message-State: AOAM531ec0B+4ibo9KErkz0/Bossvv25Bip5/meDOUUj3/w9LSWOebbe vx72tLrM8EIc5y0xO2ydYx6ySWtDq+U= X-Google-Smtp-Source: ABdhPJzsi8U+lx5v5Yb/2+LFvC8xkhoYt+LtPlY30wrn4URXRCUfR/bWwC+jB36SG/41he2tOVpLZg== X-Received: by 2002:a17:907:7248:: with SMTP id ds8mr14627823ejc.713.1643569421213; Sun, 30 Jan 2022 11:03:41 -0800 (PST) Received: from localhost.localdomain (ip5f5abb5a.dynamic.kabel-deutschland.de. [95.90.187.90]) by smtp.gmail.com with ESMTPSA id n3sm921124ejr.6.2022.01.30.11.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jan 2022 11:03:40 -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 09/12] staging: r8188eu: remove HW_VAR_CAM_WRITE Date: Sun, 30 Jan 2022 20:03:18 +0100 Message-Id: <20220130190321.7172-10-straube.linux@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com> References: <20220130190321.7172-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 Remove HW_VAR_CAM_WRITE from SetHwReg8188EU() and call rtw_write32() directly. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 3 ++- drivers/staging/r8188eu/hal/usb_halinit.c | 10 ---------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c index a8acec776b79..c6288c2d5f33 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -456,7 +456,8 @@ void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) cam_val[0] = val; cam_val[1] = addr + (unsigned int)j; - SetHwReg8188EU(padapter, HW_VAR_CAM_WRITE, (u8 *)cam_val); + rtw_write32(padapter, WCAMI, cam_val[0]); + rtw_write32(padapter, RWCAM, CAM_POLLINIG | CAM_WRITE | cam_val[1]); } } diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 96088a344d47..d3daefc0e80f 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1323,16 +1323,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) } } break; - case HW_VAR_CAM_WRITE: - { - u32 cmd; - u32 *cam_val = (u32 *)val; - rtw_write32(Adapter, WCAMI, cam_val[0]); - - cmd = CAM_POLLINIG | CAM_WRITE | cam_val[1]; - rtw_write32(Adapter, RWCAM, cmd); - } - break; case HW_VAR_AC_PARAM_BE: haldata->AcParam_BE = ((u32 *)(val))[0]; rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h index 2912151c7830..edb4696218fb 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -28,7 +28,6 @@ enum hw_variables { HW_VAR_DM_FUNC_SET, HW_VAR_DM_FUNC_CLR, HW_VAR_CAM_EMPTY_ENTRY, - HW_VAR_CAM_WRITE, HW_VAR_CAM_READ, HW_VAR_AC_PARAM_BE, HW_VAR_ACM_CTRL, -- 2.34.1