From: Michael Straube <straube.linux@gmail.com>
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 <straube.linux@gmail.com>
Subject: [PATCH 09/12] staging: r8188eu: remove HW_VAR_CAM_WRITE
Date: Sun, 30 Jan 2022 20:03:18 +0100 [thread overview]
Message-ID: <20220130190321.7172-10-straube.linux@gmail.com> (raw)
In-Reply-To: <20220130190321.7172-1-straube.linux@gmail.com>
Remove HW_VAR_CAM_WRITE from SetHwReg8188EU() and call rtw_write32()
directly.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
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
next prev parent reply other threads:[~2022-01-30 19:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-30 19:03 [PATCH 00/12] staging: r8188eu: remove some HW variables Michael Straube
2022-01-30 19:03 ` [PATCH 01/12] staging: r8188eu: remove HW_VAR_BEACON_INTERVAL Michael Straube
2022-01-30 19:03 ` [PATCH 02/12] staging: r8188eu: remove HW_VAR_SEC_CFG Michael Straube
2022-01-30 19:03 ` [PATCH 03/12] staging: r8188eu: remove HW_VAR_CAM_INVALID_ALL Michael Straube
2022-01-30 19:03 ` [PATCH 04/12] staging: r8188eu: remove HW_VAR_AC_PARAM_VO Michael Straube
2022-01-30 19:03 ` [PATCH 05/12] staging: r8188eu: remove HW_VAR_AC_PARAM_VI Michael Straube
2022-01-30 19:03 ` [PATCH 06/12] staging: r8188eu: remove HW_VAR_AC_PARAM_BK Michael Straube
2022-01-30 19:03 ` [PATCH 07/12] staging: r8188eu: remove HW_VAR_MEDIA_STATUS Michael Straube
2022-01-30 19:03 ` [PATCH 08/12] staging: r8188eu: merge Set_NETYPE0_MSR() and Set_MSR() Michael Straube
2022-01-30 19:03 ` Michael Straube [this message]
2022-01-30 19:03 ` [PATCH 10/12] staging: r8188eu: remove HW_VAR_BCN_FUNC Michael Straube
2022-01-30 19:03 ` [PATCH 11/12] staging: r8188eu: remove HW_VAR_CHECK_BSSID Michael Straube
2022-01-30 19:03 ` [PATCH 12/12] staging: r8188eu: remove HW_VAR_CAM_EMPTY_ENTRY Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220130190321.7172-10-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.