staging: vt6655: fix lines of code ending in a '('
Commit Message
fix checkpatch errors related to lines ending with a '('
by joining splitted lines of code and indenting properly to improve
visibility
Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com>
---
drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++--------------------
1 file changed, 69 insertions(+), 96 deletions(-)
Comments
On Fri, Oct 28, 2022 at 06:28:30PM +0000, Tanjuate Brunostar wrote:
> fix checkpatch errors related to lines ending with a '('
> by joining splitted lines of code and indenting properly to improve
> visibility
>
> Signed-off-by: Tanjuate Brunostar <tanjubrunostar0@gmail.com
I suspect you need to carry forward the version number, so this
would have been a v9, otherwise it's going to mess up the
patchwork bot.
I'm not sure, GregKH will let us know.
Commit msg:
Stop saying 'fix'. What did you actually do?
Commit log:
Use proper punctuation. Say why you made the change without
repeating the commit msg.
> ---
> drivers/staging/vt6655/rxtx.c | 165 ++++++++++++++--------------------
> 1 file changed, 69 insertions(+), 96 deletions(-)
>
> diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
> index 1e5036121665..7eb7c6eb5cf0 100644
> --- a/drivers/staging/vt6655/rxtx.c
> +++ b/drivers/staging/vt6655/rxtx.c
> @@ -139,15 +139,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
> * PK_TYPE_11GB 2
> * PK_TYPE_11GA 3
> */
> -static
> -unsigned int
> -s_uGetTxRsvTime(
> - struct vnt_private *pDevice,
> - unsigned char byPktType,
> - unsigned int cbFrameLength,
> - unsigned short wRate,
> - bool bNeedAck
> -)
> +static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice,
> + unsigned char byPktType,
> + unsigned int cbFrameLength,
> + unsigned short wRate,
> + bool bNeedAck)
> {
> unsigned int uDataTime, uAckTime;
>
> @@ -214,20 +210,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv,
> }
>
> /* byFreqType 0: 5GHz, 1:2.4Ghz */
> -static
> -unsigned int
> -s_uGetDataDuration(
> - struct vnt_private *pDevice,
> - unsigned char byDurType,
> - unsigned int cbFrameLength,
> - unsigned char byPktType,
> - unsigned short wRate,
> - bool bNeedAck,
> - unsigned int uFragIdx,
> - unsigned int cbLastFragmentSize,
> - unsigned int uMACfragNum,
> - unsigned char byFBOption
> -)
> +static unsigned int s_uGetDataDuration(struct vnt_private *pDevice,
> + unsigned char byDurType,
> + unsigned int cbFrameLength,
> + unsigned char byPktType,
> + unsigned short wRate,
> + bool bNeedAck,
> + unsigned int uFragIdx,
> + unsigned int cbLastFragmentSize,
> + unsigned int uMACfragNum,
> + unsigned char byFBOption)
> {
> bool bLastFrag = false;
> unsigned int uAckTime = 0, uNextPktTime = 0, len;
> @@ -316,17 +308,13 @@ s_uGetDataDuration(
> }
>
> /* byFreqType: 0=>5GHZ 1=>2.4GHZ */
> -static
> -__le16
> -s_uGetRTSCTSDuration(
> - struct vnt_private *pDevice,
> - unsigned char byDurType,
> - unsigned int cbFrameLength,
> - unsigned char byPktType,
> - unsigned short wRate,
> - bool bNeedAck,
> - unsigned char byFBOption
> -)
> +static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice,
> + unsigned char byDurType,
> + unsigned int cbFrameLength,
> + unsigned char byPktType,
> + unsigned short wRate,
> + bool bNeedAck,
> + unsigned char byFBOption)
> {
> unsigned int uCTSTime = 0, uDurTime = 0;
>
> @@ -409,22 +397,18 @@ s_uGetRTSCTSDuration(
> return cpu_to_le16((u16)uDurTime);
> }
>
> -static
> -__le16
> -s_uFillDataHead(
> - struct vnt_private *pDevice,
> - unsigned char byPktType,
> - void *pTxDataHead,
> - unsigned int cbFrameLength,
> - unsigned int uDMAIdx,
> - bool bNeedAck,
> - unsigned int uFragIdx,
> - unsigned int cbLastFragmentSize,
> - unsigned int uMACfragNum,
> - unsigned char byFBOption,
> - unsigned short wCurrentRate,
> - bool is_pspoll
> -)
> +static __le16 s_uFillDataHead(struct vnt_private *pDevice,
> + unsigned char byPktType,
> + void *pTxDataHead,
> + unsigned int cbFrameLength,
> + unsigned int uDMAIdx,
> + bool bNeedAck,
> + unsigned int uFragIdx,
> + unsigned int cbLastFragmentSize,
> + unsigned int uMACfragNum,
> + unsigned char byFBOption,
> + unsigned short wCurrentRate,
> + bool is_pspoll)
> {
> struct vnt_tx_datahead_ab *buf = pTxDataHead;
>
> @@ -555,19 +539,15 @@ s_uFillDataHead(
> return buf->duration;
> }
>
> -static
> -void
> -s_vFillRTSHead(
> - struct vnt_private *pDevice,
> - unsigned char byPktType,
> - void *pvRTS,
> - unsigned int cbFrameLength,
> - bool bNeedAck,
> - bool bDisCRC,
> - struct ieee80211_hdr *hdr,
> - unsigned short wCurrentRate,
> - unsigned char byFBOption
> -)
> +static void s_vFillRTSHead(struct vnt_private *pDevice,
> + unsigned char byPktType,
> + void *pvRTS,
> + unsigned int cbFrameLength,
> + bool bNeedAck,
> + bool bDisCRC,
> + struct ieee80211_hdr *hdr,
> + unsigned short wCurrentRate,
> + unsigned char byFBOption)
> {
> unsigned int uRTSFrameLen = 20;
>
> @@ -750,19 +730,15 @@ s_vFillRTSHead(
> }
> }
>
> -static
> -void
> -s_vFillCTSHead(
> - struct vnt_private *pDevice,
> - unsigned int uDMAIdx,
> - unsigned char byPktType,
> - void *pvCTS,
> - unsigned int cbFrameLength,
> - bool bNeedAck,
> - bool bDisCRC,
> - unsigned short wCurrentRate,
> - unsigned char byFBOption
> -)
> +static void s_vFillCTSHead(struct vnt_private *pDevice,
> + unsigned int uDMAIdx,
> + unsigned char byPktType,
> + void *pvCTS,
> + unsigned int cbFrameLength,
> + bool bNeedAck,
> + bool bDisCRC,
> + unsigned short wCurrentRate,
> + unsigned char byFBOption)
> {
> unsigned int uCTSFrameLen = 14;
>
> @@ -868,21 +844,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 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)
> {
> u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
> bool bDisCRC = false;
> @@ -954,11 +926,12 @@ s_vGenerateTxParameter(
> }
> }
>
> -static unsigned int
> -s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
> - unsigned char *pbyTxBufferAddr,
> - unsigned int uDMAIdx, struct vnt_tx_desc *pHeadTD,
> - unsigned int is_pspoll)
> +static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice,
> + unsigned char byPktType,
> + unsigned char *pbyTxBufferAddr,
> + unsigned int uDMAIdx,
> + struct vnt_tx_desc *pHeadTD,
> + unsigned int is_pspoll)
> {
> struct vnt_td_info *td_info = pHeadTD->td_info;
> struct sk_buff *skb = td_info->skb;
> --
> 2.34.1
>
>
@@ -139,15 +139,11 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
* PK_TYPE_11GB 2
* PK_TYPE_11GA 3
*/
-static
-unsigned int
-s_uGetTxRsvTime(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- unsigned int cbFrameLength,
- unsigned short wRate,
- bool bNeedAck
-)
+static unsigned int s_uGetTxRsvTime(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ unsigned int cbFrameLength,
+ unsigned short wRate,
+ bool bNeedAck)
{
unsigned int uDataTime, uAckTime;
@@ -214,20 +210,16 @@ static __le16 get_rtscts_time(struct vnt_private *priv,
}
/* byFreqType 0: 5GHz, 1:2.4Ghz */
-static
-unsigned int
-s_uGetDataDuration(
- struct vnt_private *pDevice,
- unsigned char byDurType,
- unsigned int cbFrameLength,
- unsigned char byPktType,
- unsigned short wRate,
- bool bNeedAck,
- unsigned int uFragIdx,
- unsigned int cbLastFragmentSize,
- unsigned int uMACfragNum,
- unsigned char byFBOption
-)
+static unsigned int s_uGetDataDuration(struct vnt_private *pDevice,
+ unsigned char byDurType,
+ unsigned int cbFrameLength,
+ unsigned char byPktType,
+ unsigned short wRate,
+ bool bNeedAck,
+ unsigned int uFragIdx,
+ unsigned int cbLastFragmentSize,
+ unsigned int uMACfragNum,
+ unsigned char byFBOption)
{
bool bLastFrag = false;
unsigned int uAckTime = 0, uNextPktTime = 0, len;
@@ -316,17 +308,13 @@ s_uGetDataDuration(
}
/* byFreqType: 0=>5GHZ 1=>2.4GHZ */
-static
-__le16
-s_uGetRTSCTSDuration(
- struct vnt_private *pDevice,
- unsigned char byDurType,
- unsigned int cbFrameLength,
- unsigned char byPktType,
- unsigned short wRate,
- bool bNeedAck,
- unsigned char byFBOption
-)
+static __le16 s_uGetRTSCTSDuration(struct vnt_private *pDevice,
+ unsigned char byDurType,
+ unsigned int cbFrameLength,
+ unsigned char byPktType,
+ unsigned short wRate,
+ bool bNeedAck,
+ unsigned char byFBOption)
{
unsigned int uCTSTime = 0, uDurTime = 0;
@@ -409,22 +397,18 @@ s_uGetRTSCTSDuration(
return cpu_to_le16((u16)uDurTime);
}
-static
-__le16
-s_uFillDataHead(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- void *pTxDataHead,
- unsigned int cbFrameLength,
- unsigned int uDMAIdx,
- bool bNeedAck,
- unsigned int uFragIdx,
- unsigned int cbLastFragmentSize,
- unsigned int uMACfragNum,
- unsigned char byFBOption,
- unsigned short wCurrentRate,
- bool is_pspoll
-)
+static __le16 s_uFillDataHead(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ void *pTxDataHead,
+ unsigned int cbFrameLength,
+ unsigned int uDMAIdx,
+ bool bNeedAck,
+ unsigned int uFragIdx,
+ unsigned int cbLastFragmentSize,
+ unsigned int uMACfragNum,
+ unsigned char byFBOption,
+ unsigned short wCurrentRate,
+ bool is_pspoll)
{
struct vnt_tx_datahead_ab *buf = pTxDataHead;
@@ -555,19 +539,15 @@ s_uFillDataHead(
return buf->duration;
}
-static
-void
-s_vFillRTSHead(
- struct vnt_private *pDevice,
- unsigned char byPktType,
- void *pvRTS,
- unsigned int cbFrameLength,
- bool bNeedAck,
- bool bDisCRC,
- struct ieee80211_hdr *hdr,
- unsigned short wCurrentRate,
- unsigned char byFBOption
-)
+static void s_vFillRTSHead(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ void *pvRTS,
+ unsigned int cbFrameLength,
+ bool bNeedAck,
+ bool bDisCRC,
+ struct ieee80211_hdr *hdr,
+ unsigned short wCurrentRate,
+ unsigned char byFBOption)
{
unsigned int uRTSFrameLen = 20;
@@ -750,19 +730,15 @@ s_vFillRTSHead(
}
}
-static
-void
-s_vFillCTSHead(
- struct vnt_private *pDevice,
- unsigned int uDMAIdx,
- unsigned char byPktType,
- void *pvCTS,
- unsigned int cbFrameLength,
- bool bNeedAck,
- bool bDisCRC,
- unsigned short wCurrentRate,
- unsigned char byFBOption
-)
+static void s_vFillCTSHead(struct vnt_private *pDevice,
+ unsigned int uDMAIdx,
+ unsigned char byPktType,
+ void *pvCTS,
+ unsigned int cbFrameLength,
+ bool bNeedAck,
+ bool bDisCRC,
+ unsigned short wCurrentRate,
+ unsigned char byFBOption)
{
unsigned int uCTSFrameLen = 14;
@@ -868,21 +844,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 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)
{
u16 fifo_ctl = le16_to_cpu(tx_buffer_head->fifo_ctl);
bool bDisCRC = false;
@@ -954,11 +926,12 @@ s_vGenerateTxParameter(
}
}
-static unsigned int
-s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
- unsigned char *pbyTxBufferAddr,
- unsigned int uDMAIdx, struct vnt_tx_desc *pHeadTD,
- unsigned int is_pspoll)
+static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice,
+ unsigned char byPktType,
+ unsigned char *pbyTxBufferAddr,
+ unsigned int uDMAIdx,
+ struct vnt_tx_desc *pHeadTD,
+ unsigned int is_pspoll)
{
struct vnt_td_info *td_info = pHeadTD->td_info;
struct sk_buff *skb = td_info->skb;