From 4ecaa734c5e926afc597121459cda6f68526dffb Mon Sep 17 00:00:00 2001 From: Philipp Hortmann Date: Sun, 11 Sep 2022 12:45:53 +0200 Subject: [PATCH] staging: vt6655: Cleanup and rename function MACvRestoreContext Rename function MACvRestoreContext to vt6655_mac_restore_context to avoid CamelCase which is not accepted by checkpatch.pl. Remove unnecessary declaration of function and make function static. Change declaration of cxt_buf to shorten code. Signed-off-by: Philipp Hortmann Link: https://lore.kernel.org/r/3d215bbf1675fd093c9b31fbf3b29ce09432ab27.1662890990.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/mac.c | 6 +++--- drivers/staging/vt6655/mac.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c index 092b1fffcfa1..b1aa5fbe4430 100644 --- a/drivers/staging/vt6655/mac.c +++ b/drivers/staging/vt6655/mac.c @@ -15,7 +15,7 @@ * MACvSetLongRetryLimit - Set 802.11 Long Retry limit * vt6655_mac_set_loopback_mode - Set MAC Loopback Mode * vt6655_mac_save_context - Save Context of MAC Registers - * MACvRestoreContext - Restore Context of MAC Registers + * vt6655_mac_restore_context - Restore Context of MAC Registers * MACbSoftwareReset - Software Reset MAC * MACbSafeRxOff - Turn Off MAC Rx * MACbSafeTxOff - Turn Off MAC Tx @@ -211,7 +211,7 @@ static void vt6655_mac_save_context(struct vnt_private *priv, u8 *cxt_buf) * Return Value: none * */ -void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf) +static void vt6655_mac_restore_context(struct vnt_private *priv, u8 *cxt_buf) { void __iomem *io_base = priv->port_offset; @@ -307,7 +307,7 @@ bool MACbSafeSoftwareReset(struct vnt_private *priv) /* do reset */ bRetVal = MACbSoftwareReset(priv); /* restore MAC context, except CR0 */ - MACvRestoreContext(priv, abyTmpRegData); + vt6655_mac_restore_context(priv, abyTmpRegData); return bRetVal; } diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 1752905d7df0..25247b0bf039 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -553,8 +553,6 @@ void vt6655_mac_set_short_retry_limit(struct vnt_private *priv, unsigned char re void MACvSetLongRetryLimit(struct vnt_private *priv, unsigned char byRetryLimit); -void MACvRestoreContext(struct vnt_private *priv, unsigned char *cxt_buf); - bool MACbSoftwareReset(struct vnt_private *priv); bool MACbSafeSoftwareReset(struct vnt_private *priv); bool MACbSafeRxOff(struct vnt_private *priv);