Skip to contentSkip to conversation

Fixed checkpatch warning messages

PATCH In review Shivani Bhardwaj 2 participants 4 messages Oct 10, 2015 Staging

lore
Share & tools
lore

Shivani Bhardwaj

author
#0 lore raw

cover Fixed checkpatch warning messages

This patch fixes the warnings generated by checkpatch about unnecessary code and character limits.

After applying this patch, the file becomes completely warning free.

Shivani Bhardwaj (2):
Staging: vt6655: mac: Removed unnecessary braces
Staging: vt6655: mac: Fixed character limit warning

 drivers/staging/vt6655/mac.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
Signature · 1 line
2.1.0
author
#1 lore raw

PATCH 1/2 Staging: vt6655: mac: Removed unnecessary braces

Fixed the warning generated by checkpatch braces {} are not necessary for single statement blocks, by removing them.

Signed-off-by Shivani Bhardwaj <[email protected]>
---
 drivers/staging/vt6655/mac.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/vt6655/mac.c +1 -2
index 3dfd333..688c3be 100644
@@ -689,9 +689,8 @@ void MACvSetCurrAC0DescAddrEx(void __iomem *dwIoBase,
 		if (!(byData & DMACTL_RUN))
 			break;
 	}
-	if (ww == W_MAX_TIMEOUT) {
+	if (ww == W_MAX_TIMEOUT)
 		pr_debug(" DBG_PORT80(0x26)\n");
-	}
 	VNSvOutPortD(dwIoBase + MAC_REG_AC0DMAPTR, dwCurrDescAddr);
 	if (byOrgDMACtl & DMACTL_RUN)
 		VNSvOutPortB(dwIoBase + MAC_REG_AC0DMACTL, DMACTL_RUN);
Signature · 1 line
2.1.0
author
#2 lore raw

PATCH 2/2 Staging: vt6655: mac: Fixed character limit warning

In reply to Shivani Bhardwaj

Fixed the warning generated by checkpatch: line over 80 characters by breaking the lines into sensible chunks.

Signed-off-by Shivani Bhardwaj <[email protected]>
---
 drivers/staging/vt6655/mac.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/staging/vt6655/mac.c +11 -7
index 688c3be..8a709ea 100644
@@ -46,9 +46,9 @@
  *      MACvTimer0MicroSDelay - Micro Second Delay Loop by MAC
  *
  * Revision History:
- *      08-22-2003 Kyle Hsu     :  Porting MAC functions from sim53
- *      09-03-2003 Bryan YC Fan :  Add MACvClearBusSusInd()& MACvEnableBusSusEn()
- *      09-18-2003 Jerry Chen   :  Add MACvSetKeyEntry & MACvDisableKeyEntry
+ *      08-22-2003 Kyle Hsu     : Porting MAC functions from sim53
+ *      09-03-2003 Bryan YC Fan : Add MACvClearBusSusInd()& MACvEnableBusSusEn()
+ *      09-18-2003 Jerry Chen   : Add MACvSetKeyEntry & MACvDisableKeyEntry
  *
  */
 

@@ -313,7 +313,8 @@ bool MACbSoftwareReset(void __iomem *dwIoBase)
 
 /*
  * Description:
- *      save some important register's value, then do reset, then restore register's value
+ *      Save some important register's value, then do reset,
+ *      then restore register's value
  *
  * Parameters:
  *  In:

@@ -326,7 +327,8 @@ bool MACbSoftwareReset(void __iomem *dwIoBase)
  */
 bool MACbSafeSoftwareReset(void __iomem *dwIoBase)
 {
-	unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0+MAC_MAX_CONTEXT_SIZE_PAGE1];
+	unsigned char abyTmpRegData[MAC_MAX_CONTEXT_SIZE_PAGE0 +
+		MAC_MAX_CONTEXT_SIZE_PAGE1];
 	bool bRetVal;
 
 	/* PATCH....

@@ -565,7 +567,8 @@ void MACvInitialize(void __iomem *dwIoBase)
  * Return Value: none
  *
  */
-void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr)
+void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase,
+		unsigned long dwCurrDescAddr)
 {
 	unsigned short ww;
 	unsigned char byData;

@@ -600,7 +603,8 @@ void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr
  * Return Value: none
  *
  */
-void MACvSetCurrRx1DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr)
+void MACvSetCurrRx1DescAddr(void __iomem *dwIoBase,
+		unsigned long dwCurrDescAddr)
 {
 	unsigned short ww;
 	unsigned char byData;
Signature · 1 line
2.1.0
#3 lore raw

Re: [Outreachy kernel] [PATCH 2/2] Staging: vt6655: mac: Fixed character limit warning

Quoted 5 lines · Shivani Bhardwaj

Fixed the warning generated by checkpatch: line over 80 characters by breaking the lines into sensible chunks.

Signed-off-by Shivani Bhardwaj <[email protected]>

---

<snip>

Review

Quoted 3 lines
(quoted diff) +2 -1
-void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr)
+void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase,
+		unsigned long dwCurrDescAddr)

This will introduce new checkpatch warning. It should be:

drivers/staging/vt6655/mac.c +2 -1
index 688c3be..18d1ef8 100644
@@ -565,7 +565,8 @@ void MACvInitialize(void __iomem *dwIoBase)
  * Return Value: none
  *
  */
-void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase, unsigned long dwCurrDescAddr)
+void MACvSetCurrRx0DescAddr(void __iomem *dwIoBase,
+			    unsigned long dwCurrDescAddr)
 {
 	unsigned short ww;
 	unsigned char byData;

---

regards
sudip