[PATCH] Staging: rts5208: fix space prohibited before ',' error in ms.c
Fix the checkpatch.pl errors: ERROR: space prohibited before that ',' (ctx:WxW) Signed-off-by: Emrys Bayliss --- drivers/staging/rts5208/ms.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rts5208/ms.c b/drivers/staging/rts5208/ms.c index b4612fb..7454634 100644 --- a/drivers/staging/rts5208/ms.c +++ b/drivers/staging/rts5208/ms.c @@ -781,7 +781,7 @@ static int msxc_change_power(struct rtsx_chip *chip, u8 mode) buf[4] = 0; buf[5] = 0; - retval = ms_write_bytes(chip, PRO_WRITE_REG , 6, NO_WAIT_INT, buf, 6); + retval = ms_write_bytes(chip, PRO_WRITE_REG, 6, NO_WAIT_INT, buf, 6); if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); @@ -1291,7 +1291,7 @@ static int ms_write_extra_data(struct rtsx_chip *chip, for (i = 6; i < MS_EXTRA_SIZE + 6; i++) data[i] = buf[i - 6]; - retval = ms_write_bytes(chip, WRITE_REG , (6+MS_EXTRA_SIZE), + retval = ms_write_bytes(chip, WRITE_REG, (6+MS_EXTRA_SIZE), NO_WAIT_INT, data, 16); if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); @@ -1342,7 +1342,7 @@ static int ms_read_page(struct rtsx_chip *chip, u16 block_addr, u8 page_num) data[4] = 0x20; data[5] = page_num; - retval = ms_write_bytes(chip, WRITE_REG , 6, NO_WAIT_INT, data, 6); + retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT, data, 6); if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); @@ -1619,7 +1619,7 @@ static int ms_copy_page(struct rtsx_chip *chip, u16 old_blk, u16 new_blk, data[4] = 0x20; data[5] = i; - retval = ms_write_bytes(chip, WRITE_REG , 6, NO_WAIT_INT, + retval = ms_write_bytes(chip, WRITE_REG, 6, NO_WAIT_INT, data, 6); if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); @@ -1988,7 +1988,7 @@ RE_SEARCH: RTSX_WRITE_REG(chip, PPBUF_BASE2, 0xFF, 0x88); RTSX_WRITE_REG(chip, PPBUF_BASE2 + 1, 0xFF, 0); - retval = ms_transfer_tpc(chip, MS_TM_WRITE_BYTES, WRITE_REG , 1, + retval = ms_transfer_tpc(chip, MS_TM_WRITE_BYTES, WRITE_REG, 1, NO_WAIT_INT); if (retval != STATUS_SUCCESS) TRACE_RET(chip, STATUS_FAIL); -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] Staging: vt6656: Checkpatch fix: else after break or return
This patch fixes the following checkpatch.pl error:
rxtx.c:558: WARNING: else is not generally useful after a break or return
Signed-off-by: Emrys Bayliss
---
The else statement was replaced with a block to avoid the following
compiler error:
"warning: ISO C90 forbids mixed declarations and code"
due to this declaration:
struct vnt_cts *buf = &head->cts_g; (line 559)
Is there a better way such as using head (a union) directly instead?
The last patch I sent removed the return 0. Since this isn't related to
the error in the title I left it for a separate patch.
drivers/staging/vt6656/rxtx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index ea5140a..831a051 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -555,7 +555,9 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context
*tx_context,
memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
- } else {
+ }
+
+ {
struct vnt_cts *buf = &head->cts_g;
/* Get SignalField,ServiceField,Length */
vnt_get_phy_field(priv, cts_frame_len,
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH] Staging: vt6656: Code cleanup: remove unreachable return
This patch removes an unnecessary return statement that cannot be reached. Signed-off-by: Emrys Bayliss --- drivers/staging/vt6656/rxtx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index ea5140a..0cce140 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -574,8 +574,6 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, return vnt_rxtx_datahead_g(tx_context, &buf->data_head); } - - return 0; } static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v3] Staging: vt6656: Checkpatch fix: else after break or return
This patch fixes the following checkpatch.pl error:
rxtx.c:558: WARNING: else is not generally useful after a break or return
Signed-off-by: Emrys Bayliss
---
The else statement was replaced with a block to avoid the following
compiler error:
"warning: ISO C90 forbids mixed declarations and code"
due to this declaration:
struct vnt_cts *buf = &head->cts_g; (line 559)
Is there a better way such as using head (a union) directly instead?
The last patch I sent removed the return 0. Since this isn't related to
the error in the title I left it for a separate patch.
drivers/staging/vt6656/rxtx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index ea5140a..831a051 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -555,7 +555,9 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context
*tx_context,
memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
- } else {
+ }
+
+ {
struct vnt_cts *buf = &head->cts_g;
/* Get SignalField,ServiceField,Length */
vnt_get_phy_field(priv, cts_frame_len,
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Staging: vt6656: Checkpatch fix: else after break or return
This was supposed to be a v3 patch. Resent.
On 01/14/2015 04:03 AM, Emrys Bayliss wrote:
> This patch fixes the following checkpatch.pl error:
> rxtx.c:558: WARNING: else is not generally useful after a break or return
>
> Signed-off-by: Emrys Bayliss
> ---
> The else statement was replaced with a block to avoid the following
> compiler error:
> "warning: ISO C90 forbids mixed declarations and code"
> due to this declaration:
> struct vnt_cts *buf = &head->cts_g; (line 559)
>
> Is there a better way such as using head (a union) directly instead?
>
> The last patch I sent removed the return 0. Since this isn't related to
> the error in the title I left it for a separate patch.
>
> drivers/staging/vt6656/rxtx.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
> index ea5140a..831a051 100644
> --- a/drivers/staging/vt6656/rxtx.c
> +++ b/drivers/staging/vt6656/rxtx.c
> @@ -555,7 +555,9 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context
> *tx_context,
> memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
>
> return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
> - } else {
> + }
> +
> + {
> struct vnt_cts *buf = &head->cts_g;
> /* Get SignalField,ServiceField,Length */
> vnt_get_phy_field(priv, cts_frame_len,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 0/7] Staging: vt6655: Fix style and checkpatch issues
Fix checkpatch and formatting issues in drivers/staging/vt6655/mac.h Emrys Bayliss (7): Staging: vt6655: Checkpatch fix: unnecessary whitespace Staging: vt6655: Checkpatch fix: empty c99 comments Staging: vt6655: comment after statement formatting Staging: vt6655: Checkpatch fix: c99 comments after statements Staging: vt6655: Checkpatch fix: lines longer than 80 columns Staging: vt6655: comment headings formatting Staging: vt6655: Checkpatch fix: c99 comment headings drivers/staging/vt6655/mac.h | 684 --- 1 file changed, 317 insertions(+), 367 deletions(-) -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 6/7] Staging: vt6655: comment headings formatting
This patch makes the formatting of the comments in mac.h more consistent. * Where a heading takes up three comment lines it is reduced to one. * A newline always separates column headings Signed-off-by: Emrys Bayliss --- drivers/staging/vt6655/mac.h | 93 +++- 1 file changed, 15 insertions(+), 78 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index d1a56cb..9be9bf8 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -38,9 +38,7 @@ #include "upc.h" /*- Export Definitions -*/ -// // Registers in the MAC -// #define MAC_MAX_CONTEXT_SIZE_PAGE0 256 #define MAC_MAX_CONTEXT_SIZE_PAGE1 128 @@ -69,6 +67,7 @@ #define MAC_REG_TMCTL0 0x18 #define MAC_REG_TMCTL1 0x19 #define MAC_REG_TMDATA0 0x1C + // MAC Parameter related #define MAC_REG_LRT 0x20 #define MAC_REG_SRT 0x21 @@ -85,11 +84,13 @@ #define MAC_REG_RTSFAILCNT 0x2D #define MAC_REG_ACKFAILCNT 0x2E #define MAC_REG_FCSERRCNT 0x2F + // TSF Related #define MAC_REG_TSFCNTR 0x30 #define MAC_REG_NEXTTBTT0x38 #define MAC_REG_TSFOFST 0x40 #define MAC_REG_TFTCTL 0x48 + // WMAC Control/Status Related #define MAC_REG_ENCFG 0x4C #define MAC_REG_PAGE1SEL0x4F @@ -101,6 +102,7 @@ #define MAC_REG_TCR 0x57 #define MAC_REG_IMR 0x58 #define MAC_REG_ISR 0x5C + // Power Saving Related #define MAC_REG_PSCFG 0x60 #define MAC_REG_PSCTL 0x61 @@ -112,6 +114,7 @@ #define MAC_REG_CALTMR 0x69 #define MAC_REG_SYNSPACCNT 0x6A #define MAC_REG_WAKSYNOPT 0x6B + // Baseband/IF Control Group #define MAC_REG_BBREGCTL0x6C #define MAC_REG_CHANNEL 0x6D @@ -140,12 +143,15 @@ #define MAC_REG_SYNCDMAPTR 0xA8 #define MAC_REG_ATIMDMACTL 0xAC #define MAC_REG_ATIMDMAPTR 0xB0 + // MiscFF PIO related #define MAC_REG_MISCFFNDEX 0xB4 #define MAC_REG_MISCFFCTL 0xB6 #define MAC_REG_MISCFFDATA 0xB8 + // Extend SW Timer #define MAC_REG_TMDATA1 0xBC + // WOW Related Group #define MAC_REG_WAKEUPEN0 0xC0 #define MAC_REG_WAKEUPEN1 0xC1 @@ -161,6 +167,7 @@ #define MAC_REG_CRC_128_1 0x06 #define MAC_REG_CRC_128_2 0x08 #define MAC_REG_CRC_128_3 0x0A + // MAC Configuration Group #define MAC_REG_PAR00x0C #define MAC_REG_PAR40x10 @@ -168,6 +175,7 @@ #define MAC_REG_BSSID4 0x18 #define MAC_REG_MAR00x1C #define MAC_REG_MAR40x20 + // MAC RSPPKT INFO Group #define MAC_REG_RSPINF_B_1 0x24 #define MAC_REG_RSPINF_B_2 0x28 @@ -195,9 +203,7 @@ #define MAC_REG_PWRCCK 0x73 #define MAC_REG_PWROFDM 0x7C -// // Bits in the BCFG0 register -// #define BCFG0_PERROFF 0x40 #define BCFG0_MRDMDIS 0x20 #define BCFG0_MRDLDIS 0x10 @@ -205,9 +211,7 @@ #define BCFG0_VSERREN 0x02 #define BCFG0_LATMEN0x01 -// // Bits in the BCFG1 register -// #define BCFG1_CFUNOPT 0x80 #define BCFG1_CREQOPT 0x40 #define BCFG1_DMA8 0x10 @@ -232,9 +236,7 @@ #define BISTSR2_CMDPRTEN0x02 #define BISTSR2_RAMTSTEN0x01 -// // Bits in the I2MCFG EEPROM register -// #define I2MCFG_BOUNDCTL 0x80 #define I2MCFG_WAITCTL 0x20 #define I2MCFG_SCLOECTL 0x10 @@ -243,38 +245,28 @@ #define I2MCFG_I2MLDSEQ 0x02 #define I2MCFG_I2CMFAST 0x01 -// // Bits in the I2MCSR EEPROM register -// #define I2MCSR_EEMW 0x80 #define I2MCSR_EEMR 0x40 #define I2MCSR_AUTOLD 0x08 #define I2MCSR_NACK 0x02 #define I2MCSR_DONE 0x01 -// // Bits in the PMC1 register -// #define SPS_RST 0x80 #define PCISTIKY0x40 #define PME_OVR 0x02 -// // Bits in the STICKYHW register -// #define STICKHW_DS1_SHADOW 0x02 #define STICKHW_DS0_SHADOW 0x01 -// // Bits in the TMCTL register -// #define TMCTL_TSUSP 0x04 #define TMCTL_TMD 0x02 #define TMCTL_TE0x01 -// // Bits in the TFTCTL register -// #define TFTCTL_HWUTSF 0x80 #define TFTCTL_TBTTSYNC 0x40 #define TFTCTL_HWUTSFEN 0x20 @@ -284,9 +276,7 @@ #define TFTCTL_TSFCNTRST0x02 #define TFTCTL_TSFCNTREN0x01 -// // Bits in the EnhanceCFG register -// #define EnCFG_BarkerPream 0x0002 #define EnCFG_NXTBTTCFPSTR 0x0001 #define EnCFG_BcnSusClr 0x0200 @@ -300,14 +290,10 @@ #define EnCFG_BBType_b 0x0001 #define EnCFG_BBType_a 0x -// // Bits in the Page1Sel register -// #define PAGE1_SEL 0x01 -// // Bits in the CFG register -// #define CFG_TKIPOPT 0x80 #define CFG_RXDMAOPT0x40 #define CFG_TMOT_SW 0x20 @@ -318,9 +304,7 @@ #define CFG_NOTXTIMEOUT 0x02 #define CFG_NOBUFOPT0x01 -// // Bits in the TEST register -// #define TEST_LBEXT 0x80 #define TEST_LBINT 0x40 #define TEST_LBNONE 0x00
[PATCH 5/7] Staging: vt6655: Checkpatch fix: lines longer than 80 columns
This patch fixes the following checkpatch.pl errors in mac.h:
WARNING: line over 80 characters
Signed-off-by: Emrys Bayliss
---
drivers/staging/vt6655/mac.h | 39 ++-
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index fcd1f3c..d1a56cb 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -953,15 +953,18 @@ do {
\
#define MACvSetRFLE_LatchBase(dwIoBase) \
MACvWordRegBitsOn(dwIoBase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)
-bool MACbIsRegBitsOn(void __iomem *dwIoBase, unsigned char byRegOfs, unsigned
char byTestBits);
-bool MACbIsRegBitsOff(void __iomem *dwIoBase, unsigned char byRegOfs, unsigned
char byTestBits);
+bool MACbIsRegBitsOn(void __iomem *dwIoBase, unsigned char byRegOfs,
+unsigned char byTestBits);
+bool MACbIsRegBitsOff(void __iomem *dwIoBase, unsigned char byRegOfs,
+ unsigned char byTestBits);
bool MACbIsIntDisable(void __iomem *dwIoBase);
void MACvSetShortRetryLimit(void __iomem *dwIoBase, unsigned char
byRetryLimit);
void MACvSetLongRetryLimit(void __iomem *dwIoBase, unsigned char byRetryLimit);
-void MACvGetLongRetryLimit(void __iomem *dwIoBase, unsigned char
*pbyRetryLimit);
+void MACvGetLongRetryLimit(void __iomem *dwIoBase,
+ unsigned char *pbyRetryLimit);
void MACvSetLoopbackMode(void __iomem *dwIoBase, unsigned char byLoopbackMode);
@@ -975,22 +978,32 @@ bool MACbSafeTxOff(void __iomem *dwIoBase);
bool MACbSafeStop(void __iomem *dwIoBase);
bool MACbShutdown(void __iomem *dwIoBase);
void MACvInitialize(void __iomem *dwIoBase);
-void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase, unsigned long
dwCurrDescAddr);
-void MACvSetCurrRx1DescAddr(void __iomem *dwIoBase, unsigned long
dwCurrDescAddr);
-void MACvSetCurrTXDescAddr(int iTxType, void __iomem *dwIoBase, unsigned long
dwCurrDescAddr);
-void MACvSetCurrTx0DescAddrEx(void __iomem *dwIoBase, unsigned long
dwCurrDescAddr);
-void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase, unsigned long
dwCurrDescAddr);
-void MACvSetCurrSyncDescAddrEx(void __iomem *dwIoBase, unsigned long
dwCurrDescAddr);
-void MACvSetCurrATIMDescAddrEx(void __iomem *dwIoBase, unsigned long
dwCurrDescAddr);
+void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase,
+ unsigned long dwCurrDescAddr);
+void MACvSetCurrRx1DescAddr(void __iomem *dwIoBase,
+ unsigned long dwCurrDescAddr);
+void MACvSetCurrTXDescAddr(int iTxType, void __iomem *dwIoBase,
+ unsigned long dwCurrDescAddr);
+void MACvSetCurrTx0DescAddrEx(void __iomem *dwIoBase,
+ unsigned long dwCurrDescAddr);
+void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase,
+ unsigned long dwCurrDescAddr);
+void MACvSetCurrSyncDescAddrEx(void __iomem *dwIoBase,
+ unsigned long dwCurrDescAddr);
+void MACvSetCurrATIMDescAddrEx(void __iomem *dwIoBase,
+ unsigned long dwCurrDescAddr);
void MACvTimer0MicroSDelay(void __iomem *dwIoBase, unsigned int uDelay);
void MACvOneShotTimer1MicroSec(void __iomem *dwIoBase, unsigned int
uDelayTime);
-void MACvSetMISCFifo(void __iomem *dwIoBase, unsigned short wOffset, unsigned
long dwData);
+void MACvSetMISCFifo(void __iomem *dwIoBase, unsigned short wOffset,
+unsigned long dwData);
bool MACbPSWakeup(void __iomem *dwIoBase);
-void MACvSetKeyEntry(void __iomem *dwIoBase, unsigned short wKeyCtl, unsigned
int uEntryIdx,
-unsigned int uKeyIdx, unsigned char *pbyAddr, u32 *pdwKey,
unsigned char byLocalID);
+void MACvSetKeyEntry(void __iomem *dwIoBase, unsigned short wKeyCtl,
+unsigned int uEntryIdx, unsigned int uKeyIdx,
+unsigned char *pbyAddr, u32 *pdwKey,
+unsigned char byLocalID);
void MACvDisableKeyEntry(void __iomem *dwIoBase, unsigned int uEntryIdx);
#endif /* __MAC_H__ */
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 2/7] Staging: vt6655: Checkpatch fix: empty c99 comments
This patch fixes some of the following checkpatch.pl errors in mac.h: ERROR: do not use C99 // comments This patch truncates statements which are followed by empty c99 comments. Signed-off-by: Emrys Bayliss --- This patch contains several checkpatch errors which are fixed later in the series. drivers/staging/vt6655/mac.h | 354 +-- 1 file changed, 177 insertions(+), 177 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 0f1d4a5..359e3f2 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -70,14 +70,14 @@ #define MAC_REG_TMCTL1 0x19 #define MAC_REG_TMDATA0 0x1C // MAC Parameter related -#define MAC_REG_LRT 0x20// -#define MAC_REG_SRT 0x21// -#define MAC_REG_SIFS0x22// -#define MAC_REG_DIFS0x23// -#define MAC_REG_EIFS0x24// -#define MAC_REG_SLOT0x25// -#define MAC_REG_BI 0x26// -#define MAC_REG_CWMAXMIN0 0x28// +#define MAC_REG_LRT 0x20 +#define MAC_REG_SRT 0x21 +#define MAC_REG_SIFS0x22 +#define MAC_REG_DIFS0x23 +#define MAC_REG_EIFS0x24 +#define MAC_REG_SLOT0x25 +#define MAC_REG_BI 0x26 +#define MAC_REG_CWMAXMIN0 0x28 #define MAC_REG_LINKOFFTOTM 0x2A #define MAC_REG_SWTMOT 0x2B #define MAC_REG_MIBCNTR 0x2C @@ -86,25 +86,25 @@ #define MAC_REG_ACKFAILCNT 0x2E #define MAC_REG_FCSERRCNT 0x2F // TSF Related -#define MAC_REG_TSFCNTR 0x30// -#define MAC_REG_NEXTTBTT0x38// -#define MAC_REG_TSFOFST 0x40// -#define MAC_REG_TFTCTL 0x48// +#define MAC_REG_TSFCNTR 0x30 +#define MAC_REG_NEXTTBTT0x38 +#define MAC_REG_TSFOFST 0x40 +#define MAC_REG_TFTCTL 0x48 // WMAC Control/Status Related -#define MAC_REG_ENCFG 0x4C// -#define MAC_REG_PAGE1SEL0x4F// -#define MAC_REG_CFG 0x50// -#define MAC_REG_TEST0x52// -#define MAC_REG_HOSTCR 0x54// -#define MAC_REG_MACCR 0x55// -#define MAC_REG_RCR 0x56// -#define MAC_REG_TCR 0x57// -#define MAC_REG_IMR 0x58// +#define MAC_REG_ENCFG 0x4C +#define MAC_REG_PAGE1SEL0x4F +#define MAC_REG_CFG 0x50 +#define MAC_REG_TEST0x52 +#define MAC_REG_HOSTCR 0x54 +#define MAC_REG_MACCR 0x55 +#define MAC_REG_RCR 0x56 +#define MAC_REG_TCR 0x57 +#define MAC_REG_IMR 0x58 #define MAC_REG_ISR 0x5C // Power Saving Related -#define MAC_REG_PSCFG 0x60// -#define MAC_REG_PSCTL 0x61// -#define MAC_REG_PSPWRSIG0x62// +#define MAC_REG_PSCFG 0x60 +#define MAC_REG_PSCTL 0x61 +#define MAC_REG_PSPWRSIG0x62 #define MAC_REG_BBCR13 0x63 #define MAC_REG_AIDATIM 0x64 #define MAC_REG_PWBT0x66 @@ -113,30 +113,30 @@ #define MAC_REG_SYNSPACCNT 0x6A #define MAC_REG_WAKSYNOPT 0x6B // Baseband/IF Control Group -#define MAC_REG_BBREGCTL0x6C// +#define MAC_REG_BBREGCTL0x6C #define MAC_REG_CHANNEL 0x6D #define MAC_REG_BBREGADR0x6E #define MAC_REG_BBREGDATA 0x6F -#define MAC_REG_IFREGCTL0x70// -#define MAC_REG_IFDATA 0x71// -#define MAC_REG_ITRTMSET0x74// +#define MAC_REG_IFREGCTL0x70 +#define MAC_REG_IFDATA 0x71 +#define MAC_REG_ITRTMSET0x74 #define MAC_REG_PAPEDELAY 0x77 -#define MAC_REG_SOFTPWRCTL 0x78// -#define MAC_REG_GPIOCTL00x7A// -#define MAC_REG_GPIOCTL10x7B// +#define MAC_REG_SOFTPWRCTL 0x78 +#define MAC_REG_GPIOCTL00x7A +#define MAC_REG_GPIOCTL10x7B // MAC DMA Related Group -#define MAC_REG_TXDMACTL0 0x7C// -#define MAC_REG_TXDMAPTR0 0x80// -#define MAC_REG_AC0DMACTL 0x84// -#define MAC_REG_AC0DMAPTR 0x88// -#define MAC_REG_BCNDMACTL 0x8C// -#define MAC_REG_BCNDMAPTR 0x90// -#define MAC_REG_RXDMACTL0 0x94// -#define MAC_REG_RXDMAPTR0 0x98// -#define MAC_REG_RXDMACTL1 0x9C// -#define MAC_REG_RXDMAPTR1 0xA0// -#define MAC_REG_SYNCDMACTL 0xA4// +#define MAC_REG_TXDMACTL0 0x7C +#define MAC_REG_TXDMAPTR0 0x80 +#define MAC_REG_AC0DMACTL 0x84 +#define MAC_REG_AC0DMAPTR 0x88 +#define MAC_REG_BCNDMACTL 0x8C +#define MAC_REG_BCNDMAPTR 0x90 +#define MAC_REG_RXDMACTL0 0x94 +#define MAC_REG_RXDMAPTR0 0x98 +#define MAC_REG_RXDMACTL1 0x9C +#define MAC_REG_RXDMAPTR1 0xA0 +#define MAC_REG_SYNCDMACTL 0xA4 #define MAC_REG_SYNCDMAPTR 0xA8 #define MAC_REG_ATIMDMACTL 0xAC #define MAC_REG_ATIMDMAPTR 0xB0 @@ -217,20 +217,20 @@ #define BCFG1_CISDLYEN 0x01 // Bits in RAMBIST registers -#define BISTCMD_TSTPAT5 0x00// -#define BISTCMD_TSTPATA 0x80// -#define BISTCMD_TSTERR 0x20
[PATCH 7/7] Staging: vt6655: Checkpatch fix: c99 comment headings
This patch fixes some of the following checkpatch.pl errors in mac.h ERROR: do not use C99 // comments This patch reformats all single line c99 style comments to the preferred style. Signed-off-by: Emrys Bayliss --- drivers/staging/vt6655/mac.h | 122 +-- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 9be9bf8..8e0200a 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -38,11 +38,11 @@ #include "upc.h" /*- Export Definitions -*/ -// Registers in the MAC +/* Registers in the MAC */ #define MAC_MAX_CONTEXT_SIZE_PAGE0 256 #define MAC_MAX_CONTEXT_SIZE_PAGE1 128 -// Registers not related to 802.11b +/* Registers not related to 802.11b */ #define MAC_REG_BCFG0 0x00 #define MAC_REG_BCFG1 0x01 #define MAC_REG_FCR00x02 @@ -68,7 +68,7 @@ #define MAC_REG_TMCTL1 0x19 #define MAC_REG_TMDATA0 0x1C -// MAC Parameter related +/* MAC Parameter related */ #define MAC_REG_LRT 0x20 #define MAC_REG_SRT 0x21 #define MAC_REG_SIFS0x22 @@ -85,13 +85,13 @@ #define MAC_REG_ACKFAILCNT 0x2E #define MAC_REG_FCSERRCNT 0x2F -// TSF Related +/* TSF Related */ #define MAC_REG_TSFCNTR 0x30 #define MAC_REG_NEXTTBTT0x38 #define MAC_REG_TSFOFST 0x40 #define MAC_REG_TFTCTL 0x48 -// WMAC Control/Status Related +/* WMAC Control/Status Related */ #define MAC_REG_ENCFG 0x4C #define MAC_REG_PAGE1SEL0x4F #define MAC_REG_CFG 0x50 @@ -103,7 +103,7 @@ #define MAC_REG_IMR 0x58 #define MAC_REG_ISR 0x5C -// Power Saving Related +/* Power Saving Related */ #define MAC_REG_PSCFG 0x60 #define MAC_REG_PSCTL 0x61 #define MAC_REG_PSPWRSIG0x62 @@ -115,7 +115,7 @@ #define MAC_REG_SYNSPACCNT 0x6A #define MAC_REG_WAKSYNOPT 0x6B -// Baseband/IF Control Group +/* Baseband/IF Control Group */ #define MAC_REG_BBREGCTL0x6C #define MAC_REG_CHANNEL 0x6D #define MAC_REG_BBREGADR0x6E @@ -128,7 +128,7 @@ #define MAC_REG_GPIOCTL00x7A #define MAC_REG_GPIOCTL10x7B -// MAC DMA Related Group +/* MAC DMA Related Group */ #define MAC_REG_TXDMACTL0 0x7C #define MAC_REG_TXDMAPTR0 0x80 #define MAC_REG_AC0DMACTL 0x84 @@ -144,15 +144,15 @@ #define MAC_REG_ATIMDMACTL 0xAC #define MAC_REG_ATIMDMAPTR 0xB0 -// MiscFF PIO related +/* MiscFF PIO related */ #define MAC_REG_MISCFFNDEX 0xB4 #define MAC_REG_MISCFFCTL 0xB6 #define MAC_REG_MISCFFDATA 0xB8 -// Extend SW Timer +/* Extend SW Timer */ #define MAC_REG_TMDATA1 0xBC -// WOW Related Group +/* WOW Related Group */ #define MAC_REG_WAKEUPEN0 0xC0 #define MAC_REG_WAKEUPEN1 0xC1 #define MAC_REG_WAKEUPSR0 0xC2 @@ -162,13 +162,13 @@ #define MAC_REG_WAKE128_2 0xE4 #define MAC_REG_WAKE128_3 0xF4 -/// Page 1 /// +/** Page 1 **/ #define MAC_REG_CRC_128_0 0x04 #define MAC_REG_CRC_128_1 0x06 #define MAC_REG_CRC_128_2 0x08 #define MAC_REG_CRC_128_3 0x0A -// MAC Configuration Group +/* MAC Configuration Group */ #define MAC_REG_PAR00x0C #define MAC_REG_PAR40x10 #define MAC_REG_BSSID0 0x14 @@ -176,7 +176,7 @@ #define MAC_REG_MAR00x1C #define MAC_REG_MAR40x20 -// MAC RSPPKT INFO Group +/* MAC RSPPKT INFO Group */ #define MAC_REG_RSPINF_B_1 0x24 #define MAC_REG_RSPINF_B_2 0x28 #define MAC_REG_RSPINF_B_5 0x2C @@ -191,7 +191,7 @@ #define MAC_REG_RSPINF_A_54 0x42 #define MAC_REG_RSPINF_A_72 0x44 -// 802.11h relative +/* 802.11h relative */ #define MAC_REG_QUIETINIT 0x60 #define MAC_REG_QUIETGAP0x62 #define MAC_REG_QUIETDUR0x64 @@ -203,7 +203,7 @@ #define MAC_REG_PWRCCK 0x73 #define MAC_REG_PWROFDM 0x7C -// Bits in the BCFG0 register +/* Bits in the BCFG0 register */ #define BCFG0_PERROFF 0x40 #define BCFG0_MRDMDIS 0x20 #define BCFG0_MRDLDIS 0x10 @@ -211,7 +211,7 @@ #define BCFG0_VSERREN 0x02 #define BCFG0_LATMEN0x01 -// Bits in the BCFG1 register +/* Bits in the BCFG1 register */ #define BCFG1_CFUNOPT 0x80 #define BCFG1_CREQOPT 0x40 #define BCFG1_DMA8 0x10 @@ -220,7 +220,7 @@ #define BCFG1_MIOEN 0x02 #define BCFG1_CISDLYEN 0x01 -// Bits in RAMBIST registers +/* Bits in RAMBIST registers */ #define BISTCMD_TSTPAT5 0x00 #define BISTCMD_TSTPATA 0x80 #define BISTCMD_TSTERR 0x20 @@ -236,7 +236,7 @@ #define BISTSR2_CMDPRTEN0x02 #define BISTSR2_RAMTSTEN0x01 -// Bits in the I2MCFG EEPROM register +/* Bits in the I2MCFG EEPROM register */ #define I2MCFG_BOUNDCTL 0x80 #define I2MCFG_WAITCTL 0x20 #define I2MCFG_SCLOECTL 0x10 @@ -245,28 +245,28 @@ #define I2MCFG_I2MLDSEQ 0x02 #define I2MCFG_I2CMFAST 0x01 -// Bits in the I2MCSR EEPROM register +
[PATCH 4/7] Staging: vt6655: Checkpatch fix: c99 comments after statements
This patch fixes some c99 errors in mac.h: ERROR: do not use C99 // comments All instances where the c99 comment occurs after a statement. Signed-off-by: Emrys Bayliss --- drivers/staging/vt6655/mac.h | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index f29fe30..fcd1f3c 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -336,12 +336,12 @@ // #define HOSTCR_TXONST 0x80 #define HOSTCR_RXONST 0x40 -#define HOSTCR_ADHOC0x20 // Network Type 1 = Ad-hoc -#define HOSTCR_AP 0x10 // Port Type 1 = AP -#define HOSTCR_TXON 0x08 // 1000 -#define HOSTCR_RXON 0x04 // 0100 -#define HOSTCR_MACEN0x02 // 0010 -#define HOSTCR_SOFTRST 0x01 // 0001 +#define HOSTCR_ADHOC0x20 /* Network Type 1 = Ad-hoc */ +#define HOSTCR_AP 0x10 /* Port Type 1 = AP */ +#define HOSTCR_TXON 0x08 /* 1000 */ +#define HOSTCR_RXON 0x04 /* 0100 */ +#define HOSTCR_MACEN0x02 /* 0010 */ +#define HOSTCR_SOFTRST 0x01 /* 0001 */ // // Bits in the MACCR register @@ -371,7 +371,7 @@ // Bits in the TCR register // #define TCR_SYNCDCFOPT 0x02 -#define TCR_AUTOBCNTX 0x01 // Beacon automatically transmit enable +#define TCR_AUTOBCNTX 0x01 /* Beacon automatically transmit enable */ // // Bits in the IMR register @@ -381,7 +381,7 @@ #define IMR_RADARDETECT 0x1000 #define IMR_MEASUREEND 0x0800 #define IMR_SOFTTIMER1 0x0020 -#define IMR_RXDMA1 0x1000 // 0001 +#define IMR_RXDMA1 0x1000 /* 0001 */ #define IMR_RXNOBUF 0x0800 #define IMR_MIBNEARFULL 0x0400 #define IMR_SOFTINT 0x0200 @@ -404,9 +404,9 @@ #define ISR_RADARDETECT 0x1000 #define ISR_MEASUREEND 0x0800 #define ISR_SOFTTIMER1 0x0020 -#define ISR_RXDMA1 0x1000 // 0001 -#define ISR_RXNOBUF 0x0800 // 1000 -#define ISR_MIBNEARFULL 0x0400 // 0100 +#define ISR_RXDMA1 0x1000 /* 0001 */ +#define ISR_RXNOBUF 0x0800 /* 1000 */ +#define ISR_MIBNEARFULL 0x0400 /* 0100 */ #define ISR_SOFTINT 0x0200 #define ISR_FETALERR0x0100 #define ISR_WATCHDOG0x0080 @@ -603,7 +603,7 @@ #define W_MAX_TIMEOUT 0xFFF0U // wait time within loop -#define CB_DELAY_LOOP_WAIT 10 // 10ms +#define CB_DELAY_LOOP_WAIT 10 /* 10ms */ // // revision id @@ -993,4 +993,4 @@ void MACvSetKeyEntry(void __iomem *dwIoBase, unsigned short wKeyCtl, unsigned in unsigned int uKeyIdx, unsigned char *pbyAddr, u32 *pdwKey, unsigned char byLocalID); void MACvDisableKeyEntry(void __iomem *dwIoBase, unsigned int uEntryIdx); -#endif // __MAC_H__ +#endif /* __MAC_H__ */ -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/7] Staging: vt6655: Checkpatch fix: unnecessary whitespace
This patch fixes the following checkpatch.pl errors in mac.h:
ERROR: space prohibited before that ',' (ctx:WxW)
Signed-off-by: Emrys Bayliss
---
drivers/staging/vt6655/mac.h | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index e1e7e10..0f1d4a5 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -888,7 +888,7 @@ do {
\
VNSvOutPortB(dwIoBase + MAC_REG_PAGE1SEL, 1)
#define MACvReadMIBCounter(dwIoBase, pdwCounter) \
- VNSvInPortD(dwIoBase + MAC_REG_MIBCNTR , pdwCounter)
+ VNSvInPortD(dwIoBase + MAC_REG_MIBCNTR, pdwCounter)
#define MACvPwrEvntDisable(dwIoBase) \
VNSvOutPortW(dwIoBase + MAC_REG_WAKEUPEN0, 0x)
@@ -896,7 +896,7 @@ do {
\
#define MACvEnableProtectMD(dwIoBase) \
do { \
unsigned long dwOrgValue; \
- VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue);\
+ VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue); \
dwOrgValue = dwOrgValue | EnCFG_ProtectMd; \
VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue); \
} while (0)
@@ -904,7 +904,7 @@ do {
\
#define MACvDisableProtectMD(dwIoBase) \
do { \
unsigned long dwOrgValue; \
- VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue);\
+ VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue); \
dwOrgValue = dwOrgValue & ~EnCFG_ProtectMd; \
VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue); \
} while (0)
@@ -912,7 +912,7 @@ do {
\
#define MACvEnableBarkerPreambleMd(dwIoBase) \
do { \
unsigned long dwOrgValue; \
- VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue);\
+ VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue); \
dwOrgValue = dwOrgValue | EnCFG_BarkerPream;\
VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue); \
} while (0)
@@ -920,7 +920,7 @@ do {
\
#define MACvDisableBarkerPreambleMd(dwIoBase) \
do { \
unsigned long dwOrgValue; \
- VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue);\
+ VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue); \
dwOrgValue = dwOrgValue & ~EnCFG_BarkerPream; \
VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue); \
} while (0)
@@ -928,7 +928,7 @@ do {
\
#define MACvSetBBType(dwIoBase, byTyp) \
do { \
unsigned long dwOrgValue; \
- VNSvInPortD(dwIoBase + MAC_REG_ENCFG , &dwOrgValue);\
+ VNSvInPortD(dwIoBase + MAC_REG_ENCFG, &dwOrgValue); \
dwOrgValue = dwOrgValue & ~EnCFG_BBType_MASK; \
dwOrgValue = dwOrgValue | (unsigned long)byTyp; \
VNSvOutPortD(dwIoBase + MAC_REG_ENCFG, dwOrgValue); \
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/7] Staging: vt6655: comment after statement formatting
This patch makes the formatting of the comments in mac.h more consistent. * Where a comment follows a statement, it is separated by a single space. Signed-off-by: Emrys Bayliss --- drivers/staging/vt6655/mac.h | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 359e3f2..f29fe30 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -336,12 +336,12 @@ // #define HOSTCR_TXONST 0x80 #define HOSTCR_RXONST 0x40 -#define HOSTCR_ADHOC0x20// Network Type 1 = Ad-hoc -#define HOSTCR_AP 0x10// Port Type 1 = AP -#define HOSTCR_TXON 0x08// 1000 -#define HOSTCR_RXON 0x04// 0100 -#define HOSTCR_MACEN0x02// 0010 -#define HOSTCR_SOFTRST 0x01// 0001 +#define HOSTCR_ADHOC0x20 // Network Type 1 = Ad-hoc +#define HOSTCR_AP 0x10 // Port Type 1 = AP +#define HOSTCR_TXON 0x08 // 1000 +#define HOSTCR_RXON 0x04 // 0100 +#define HOSTCR_MACEN0x02 // 0010 +#define HOSTCR_SOFTRST 0x01 // 0001 // // Bits in the MACCR register @@ -371,7 +371,7 @@ // Bits in the TCR register // #define TCR_SYNCDCFOPT 0x02 -#define TCR_AUTOBCNTX 0x01// Beacon automatically transmit enable +#define TCR_AUTOBCNTX 0x01 // Beacon automatically transmit enable // // Bits in the IMR register @@ -381,7 +381,7 @@ #define IMR_RADARDETECT 0x1000 #define IMR_MEASUREEND 0x0800 #define IMR_SOFTTIMER1 0x0020 -#define IMR_RXDMA1 0x1000 // 0001 +#define IMR_RXDMA1 0x1000 // 0001 #define IMR_RXNOBUF 0x0800 #define IMR_MIBNEARFULL 0x0400 #define IMR_SOFTINT 0x0200 @@ -404,9 +404,9 @@ #define ISR_RADARDETECT 0x1000 #define ISR_MEASUREEND 0x0800 #define ISR_SOFTTIMER1 0x0020 -#define ISR_RXDMA1 0x1000 // 0001 -#define ISR_RXNOBUF 0x0800 // 1000 -#define ISR_MIBNEARFULL 0x0400 // 0100 +#define ISR_RXDMA1 0x1000 // 0001 +#define ISR_RXNOBUF 0x0800 // 1000 +#define ISR_MIBNEARFULL 0x0400 // 0100 #define ISR_SOFTINT 0x0200 #define ISR_FETALERR0x0100 #define ISR_WATCHDOG0x0080 @@ -603,7 +603,7 @@ #define W_MAX_TIMEOUT 0xFFF0U // wait time within loop -#define CB_DELAY_LOOP_WAIT 10 // 10ms +#define CB_DELAY_LOOP_WAIT 10 // 10ms // // revision id -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] Staging: vt6656: Checkpatch fix: else after break or return
This patch fixes the following checkpatch.pl error:
rxtx.c:588: WARNING: else is not generally useful after a break or return
Signed-off-by: Emrys Bayliss
---
drivers/staging/vt6656/rxtx.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index ea5140a..cc34704 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -553,8 +553,6 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context
*tx_context,
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
-
- return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
} else {
struct vnt_cts *buf = &head->cts_g;
/* Get SignalField,ServiceField,Length */
@@ -571,11 +569,9 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context
*tx_context,
cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
-
- return vnt_rxtx_datahead_g(tx_context, &buf->data_head);
}
- return 0;
+ return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
}
static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,
--
2.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Staging: vt6656: Checkpatch fix: else after break or return
This is a bungle please disregard it.
I will send it again with a 'ret' variable if that's okay (one that
has been properly proofed and compiles).
My apologies. Sorry for completely wasting your time by not
checking properly.
On 01/12/2015 08:30 AM, Malcolm Priestley wrote:
>
>
> On 11/01/15 16:42, Joe Perches wrote:
>> On Mon, 2015-01-12 at 03:19 +1100, Emrys Bayliss wrote:
>>> This patch fixes the following checkpatch.pl error:
>>> rxtx.c:588: WARNING: else is not generally useful after a break or return
>>>
>>> Signed-off-by: Emrys Bayliss
>>> ---
>>> drivers/staging/vt6656/rxtx.c | 6 +-
>>> 1 file changed, 1 insertion(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
>>> index ea5140a..cc34704 100644
>>> --- a/drivers/staging/vt6656/rxtx.c
>>> +++ b/drivers/staging/vt6656/rxtx.c
>>> @@ -553,8 +553,6 @@ static u16 vnt_fill_cts_head(struct
>>> vnt_usb_send_context *tx_context,
>>> cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
>>>
>>> memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
>>> -
>>> -return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
>>> } else {
>>> struct vnt_cts *buf = &head->cts_g;
>>> /* Get SignalField,ServiceField,Length */
>>> @@ -571,11 +569,9 @@ static u16 vnt_fill_cts_head(struct
>>> vnt_usb_send_context *tx_context,
>>> cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
>>>
>>> memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
>>> -
>>> -return vnt_rxtx_datahead_g(tx_context, &buf->data_head);
>>> }
>>>
>>> -return 0;
>>> +return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
>>> }
>>>
>>> static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,
>>
>> This is not the same code.
>> Does this even compile?
>>
>> For the second block, you've changed
>> return _g(...) to _g_fb(...).
>>
> Yes, this is wrong and will cause CTS to fail.
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2] Staging: vt6656: Checkpatch fix: else after break or return
This patch fixes the following checkpatch.pl error: rxtx.c:588: WARNING: else is not generally useful after a break or return Signed-off-by: Emrys Bayliss --- drivers/staging/vt6656/rxtx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index ea5140a..0cce140 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -574,8 +574,6 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, return vnt_rxtx_datahead_g(tx_context, &buf->data_head); } - - return 0; } static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, -- 2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
