2022-11-03 11:39:04

by Tanjuate Brunostar

Subject: [PATCH] staging: vt6655: change the function name s_vGenerateTxParameter

Remove the use of Hongarian notation which is not used in Linux kernel.
Join some lines of code to avoid a line ending in a '('
Reported by Checkpatch

Signed-off-by: Tanjuate Brunostar <[email protected]>
---
drivers/staging/vt6655/rxtx.c | 54 ++++++++++++++++-------------------
1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index debc5d5daede..793a63b2ff46 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -10,7 +10,7 @@
* Date: May 20, 2003
*
* Functions:
- * s_vGenerateTxParameter - Generate tx dma required parameter.
+ * generate_tx_parameter - Generate tx dma required parameter.
* vGenerateMACHeader - Translate 802.3 to 802.11 header
* cbGetFragCount - Calculate fragment number count
* csBeacon_xmit - beacon tx function
@@ -95,17 +95,17 @@ static void fill_rts_header(struct vnt_private *pDevice,
unsigned short wCurrentRate,
unsigned char byFBOption);

-static void s_vGenerateTxParameter(struct vnt_private *pDevice,
- unsigned char byPktType,
- struct vnt_tx_fifo_head *,
- void *pvRrvTime,
- void *pvRTS,
- void *pvCTS,
- unsigned int cbFrameSize,
- bool bNeedACK,
- unsigned int uDMAIdx,
- void *psEthHeader,
- unsigned short wCurrentRate);
+static void generate_tx_parameter(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ struct vnt_tx_fifo_head *,
+ void *pvRrvTime,
+ void *pvRTS,
+ void *pvCTS,
+ unsigned int cbFrameSize,
+ bool bNeedACK,
+ unsigned int uDMAIdx,
+ void *psEthHeader,
+ unsigned short wCurrentRate);

static unsigned int
s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
@@ -864,21 +864,17 @@ s_vFillCTSHead(
-
* unsigned int cbFrameSize, Hdr+Payload+FCS
*/
-static
-void
-s_vGenerateTxParameter(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- struct vnt_tx_fifo_head *tx_buffer_head,
- void *pvRrvTime,
- void *pvRTS,
- void *pvCTS,
- unsigned int cbFrameSize,
- bool bNeedACK,
- unsigned int uDMAIdx,
- void *psEthHeader,
- unsigned short wCurrentRate
-)
+static void generate_tx_parameter(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ struct vnt_tx_fifo_head *tx_buffer_head,
+ void *pvRrvTime,
+ void *pvRTS,
+ void *pvCTS,
+ unsigned int cbFrameSize,
+ bool bNeedACK,
+ unsigned int uDMAIdx,
+ void *psEthHeader,
+ unsigned short wCurrentRate)
{
u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
bool bDisCRC = false;
@@ -1107,8 +1103,8 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
memset((void *)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderLength - wTxBufSize));

/* Fill FIFO,RrvTime,RTS,and CTS */
- s_vGenerateTxParameter(pDevice, byPktType, tx_buffer_head, pvRrvTime, pvRTS, pvCTS,
- cbFrameSize, bNeedACK, uDMAIdx, hdr, pDevice->wCurrentRate);
+ generate_tx_parameter(pDevice, byPktType, tx_buffer_head, pvRrvTime, pvRTS, pvCTS,
+ cbFrameSize, bNeedACK, uDMAIdx, hdr, pDevice->wCurrentRate);
/* Fill DataHead */
uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,
0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate, is_pspoll);
--
2.34.1

2022-11-03 22:44:12

by Philipp Hortmann

Subject: Re: [PATCH] staging: vt6655: change the function name s_vGenerateTxParameter

On 11/3/22 12:29, Tanjuate Brunostar wrote:
> Remove the use of Hongarian notation which is not used in Linux kernel.
> Join some lines of code to avoid a line ending in a '('
> Reported by Checkpatch
>
> Signed-off-by: Tanjuate Brunostar <[email protected]>
> ---
> drivers/staging/vt6655/rxtx.c | 54 ++++++++++++++++-------------------
> 1 file changed, 25 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> index debc5d5daede..793a63b2ff46 100644
> --- a/drivers/staging/vt6655/rxtx.c
> +++ b/drivers/staging/vt6655/rxtx.c
> @@ -10,7 +10,7 @@
> * Date: May 20, 2003
> *
> * Functions:
> - * s_vGenerateTxParameter - Generate tx dma required parameter.
> + * generate_tx_parameter - Generate tx dma required parameter.
> * vGenerateMACHeader - Translate 802.3 to 802.11 header
> * cbGetFragCount - Calculate fragment number count
> * csBeacon_xmit - beacon tx function
> @@ -95,17 +95,17 @@ static void fill_rts_header(struct vnt_private *pDevice,
> unsigned short wCurrentRate,
> unsigned char byFBOption);
>
> -static void s_vGenerateTxParameter(struct vnt_private *pDevice,
> - unsigned char byPktType,
> - struct vnt_tx_fifo_head *,
> - void *pvRrvTime,
> - void *pvRTS,
> - void *pvCTS,
> - unsigned int cbFrameSize,
> - bool bNeedACK,
> - unsigned int uDMAIdx,
> - void *psEthHeader,
> - unsigned short wCurrentRate);
> +static void generate_tx_parameter(struct vnt_private *pDevice,
> + unsigned char byPktType,
> + struct vnt_tx_fifo_head *,
> + void *pvRrvTime,
> + void *pvRTS,
> + void *pvCTS,
> + unsigned int cbFrameSize,
> + bool bNeedACK,
> + unsigned int uDMAIdx,
> + void *psEthHeader,
> + unsigned short wCurrentRate);
>
> static unsigned int
> s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
> @@ -864,21 +864,17 @@ s_vFillCTSHead(
> -
> * unsigned int cbFrameSize, Hdr+Payload+FCS
> */
> -static
> -void
> -s_vGenerateTxParameter(
> - struct vnt_private *pDevice,
> - unsigned char byPktType,
> - struct vnt_tx_fifo_head *tx_buffer_head,
> - void *pvRrvTime,
> - void *pvRTS,
> - void *pvCTS,
> - unsigned int cbFrameSize,
> - bool bNeedACK,
> - unsigned int uDMAIdx,
> - void *psEthHeader,
> - unsigned short wCurrentRate
> -)
> +static void generate_tx_parameter(struct vnt_private *pDevice,
> + unsigned char byPktType,
> + struct vnt_tx_fifo_head *tx_buffer_head,
> + void *pvRrvTime,
> + void *pvRTS,
> + void *pvCTS,
> + unsigned int cbFrameSize,
> + bool bNeedACK,
> + unsigned int uDMAIdx,
> + void *psEthHeader,
> + unsigned short wCurrentRate)
> {
> u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
> bool bDisCRC = false;
> @@ -1107,8 +1103,8 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
> memset((void *)(pbyTxBufferAddr + wTxBufSize), 0, (cbHeaderLength - wTxBufSize));
>
> /* Fill FIFO,RrvTime,RTS,and CTS */
> - s_vGenerateTxParameter(pDevice, byPktType, tx_buffer_head, pvRrvTime, pvRTS, pvCTS,
> - cbFrameSize, bNeedACK, uDMAIdx, hdr, pDevice->wCurrentRate);
> + generate_tx_parameter(pDevice, byPktType, tx_buffer_head, pvRrvTime, pvRTS, pvCTS,
> + cbFrameSize, bNeedACK, uDMAIdx, hdr, pDevice->wCurrentRate);
> /* Fill DataHead */
> uDuration = s_uFillDataHead(pDevice, byPktType, pvTxDataHd, cbFrameSize, uDMAIdx, bNeedACK,
> 0, 0, uMACfragNum, byFBOption, pDevice->wCurrentRate, is_pspoll);

I cannot apply your patch.

Bye Philipp

2022-11-08 16:38:27

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: vt6655: change the function name s_vGenerateTxParameter

On Thu, Nov 03, 2022 at 11:29:06AM +0000, Tanjuate Brunostar wrote:
> Remove the use of Hongarian notation which is not used in Linux kernel.
> Join some lines of code to avoid a line ending in a '('
> Reported by Checkpatch
>
> Signed-off-by: Tanjuate Brunostar <[email protected]>
> ---
> drivers/staging/vt6655/rxtx.c | 54 ++++++++++++++++-------------------
> 1 file changed, 25 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> index debc5d5daede..793a63b2ff46 100644
> --- a/drivers/staging/vt6655/rxtx.c
> +++ b/drivers/staging/vt6655/rxtx.c
> @@ -10,7 +10,7 @@
> * Date: May 20, 2003
> *
> * Functions:
> - * s_vGenerateTxParameter - Generate tx dma required parameter.
> + * generate_tx_parameter - Generate tx dma required parameter.
> * vGenerateMACHeader - Translate 802.3 to 802.11 header
> * cbGetFragCount - Calculate fragment number count
> * csBeacon_xmit - beacon tx function
> @@ -95,17 +95,17 @@ static void fill_rts_header(struct vnt_private *pDevice,
> unsigned short wCurrentRate,
> unsigned char byFBOption);
>
> -static void s_vGenerateTxParameter(struct vnt_private *pDevice,
> - unsigned char byPktType,
> - struct vnt_tx_fifo_head *,
> - void *pvRrvTime,
> - void *pvRTS,
> - void *pvCTS,
> - unsigned int cbFrameSize,
> - bool bNeedACK,
> - unsigned int uDMAIdx,
> - void *psEthHeader,
> - unsigned short wCurrentRate);
> +static void generate_tx_parameter(struct vnt_private *pDevice,
> + unsigned char byPktType,
> + struct vnt_tx_fifo_head *,
> + void *pvRrvTime,
> + void *pvRTS,
> + void *pvCTS,
> + unsigned int cbFrameSize,
> + bool bNeedACK,
> + unsigned int uDMAIdx,
> + void *psEthHeader,
> + unsigned short wCurrentRate);
>

This function prototype is not needed at all, right? So just delete it
instead of renaming it.

thanks,

greg k-h