linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] staging: slicoss: fix camel case check
@ 2016-05-29 13:31 Jaime Arrocha
  2016-05-30 14:29 ` Luis de Bethencourt
  0 siblings, 1 reply; 2+ messages in thread
From: Jaime Arrocha @ 2016-05-29 13:31 UTC (permalink / raw)
  To: gregkh; +Cc: liodot, charrer, devel, linux-kernel, Jaime Arrocha

From: Jaime Arrocha <jarr@innercoder.com>

Fixed several checks about camel case use provided by checkpatch.pl.
CHECK: Avoid CamelCase
Changes verified to work by compiling module.

Signed-off-by: Jaime Arrocha <jarr@innercoder.com>
---
 drivers/staging/slicoss/slic.h    | 30 +++++++++++------------
 drivers/staging/slicoss/slicoss.c | 50 +++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
index 6722743..2c1d819 100644
--- a/drivers/staging/slicoss/slic.h
+++ b/drivers/staging/slicoss/slic.h
@@ -52,8 +52,8 @@
 
 #define GB_RCVUCODE_VERS_STRING  "1.2"
 #define GB_RCVUCODE_VERS_DATE    "2006/03/27 15:12:15"
-static u32 OasisRcvUCodeLen = 512;
-static u32 GBRcvUCodeLen = 512;
+static u32 oasis_rcvucodelen = 512;
+static u32 gb_rcvucodelen = 512;
 #define SECTION_SIZE 65536
 
 #define SLIC_RSPQ_PAGES_GB	  10
@@ -370,20 +370,20 @@ struct slic_upr {
 struct slic_ifevents {
 	uint        oflow802;
 	uint        uflow802;
-	uint        Tprtoflow;
+	uint        tprtoflow;
 	uint        rcvearly;
-	uint        Bufov;
-	uint        Carre;
-	uint        Longe;
-	uint        Invp;
-	uint        Crc;
-	uint        Drbl;
-	uint        Code;
-	uint        IpHlen;
-	uint        IpLen;
-	uint        IpCsum;
-	uint        TpCsum;
-	uint        TpHlen;
+	uint        bufov;
+	uint        carre;
+	uint        longe;
+	uint        invp;
+	uint        crc;
+	uint        drbl;
+	uint        code;
+	uint        iphlen;
+	uint        iplen;
+	uint        ipcsum;
+	uint        tpcsum;
+	uint        tphlen;
 };
 
 struct adapter {
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index ac126d4..04d0078 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -414,13 +414,13 @@ static int slic_card_download_gbrcv(struct adapter *adapter)
 	index += 4;
 	switch (adapter->devid) {
 	case SLIC_2GB_DEVICE_ID:
-		if (rcvucodelen != OasisRcvUCodeLen) {
+		if (rcvucodelen != oasis_rcvucodelen) {
 			release_firmware(fw);
 			return -EINVAL;
 		}
 		break;
 	case SLIC_1GB_DEVICE_ID:
-		if (rcvucodelen != GBRcvUCodeLen) {
+		if (rcvucodelen != gb_rcvucodelen) {
 			release_firmware(fw);
 			return -EINVAL;
 		}
@@ -1917,7 +1917,7 @@ static void slic_rcv_handle_error(struct adapter *adapter,
 		if (hdr->frame_status14 & VRHSTAT_802OE)
 			adapter->if_events.oflow802++;
 		if (hdr->frame_status14 & VRHSTAT_TPOFLO)
-			adapter->if_events.Tprtoflow++;
+			adapter->if_events.tprtoflow++;
 		if (hdr->frame_status_b14 & VRHSTATB_802UE)
 			adapter->if_events.uflow802++;
 		if (hdr->frame_status_b14 & VRHSTATB_RCVE) {
@@ -1925,45 +1925,45 @@ static void slic_rcv_handle_error(struct adapter *adapter,
 			netdev->stats.rx_fifo_errors++;
 		}
 		if (hdr->frame_status_b14 & VRHSTATB_BUFF) {
-			adapter->if_events.Bufov++;
+			adapter->if_events.bufov++;
 			netdev->stats.rx_over_errors++;
 		}
 		if (hdr->frame_status_b14 & VRHSTATB_CARRE) {
-			adapter->if_events.Carre++;
+			adapter->if_events.carre++;
 			netdev->stats.tx_carrier_errors++;
 		}
 		if (hdr->frame_status_b14 & VRHSTATB_LONGE)
-			adapter->if_events.Longe++;
+			adapter->if_events.longe++;
 		if (hdr->frame_status_b14 & VRHSTATB_PREA)
-			adapter->if_events.Invp++;
+			adapter->if_events.invp++;
 		if (hdr->frame_status_b14 & VRHSTATB_CRC) {
-			adapter->if_events.Crc++;
+			adapter->if_events.crc++;
 			netdev->stats.rx_crc_errors++;
 		}
 		if (hdr->frame_status_b14 & VRHSTATB_DRBL)
-			adapter->if_events.Drbl++;
+			adapter->if_events.drbl++;
 		if (hdr->frame_status_b14 & VRHSTATB_CODE)
-			adapter->if_events.Code++;
+			adapter->if_events.code++;
 		if (hdr->frame_status_b14 & VRHSTATB_TPCSUM)
-			adapter->if_events.TpCsum++;
+			adapter->if_events.tpcsum++;
 		if (hdr->frame_status_b14 & VRHSTATB_TPHLEN)
-			adapter->if_events.TpHlen++;
+			adapter->if_events.tphlen++;
 		if (hdr->frame_status_b14 & VRHSTATB_IPCSUM)
-			adapter->if_events.IpCsum++;
+			adapter->if_events.ipcsum++;
 		if (hdr->frame_status_b14 & VRHSTATB_IPLERR)
-			adapter->if_events.IpLen++;
+			adapter->if_events.iplen++;
 		if (hdr->frame_status_b14 & VRHSTATB_IPHERR)
-			adapter->if_events.IpHlen++;
+			adapter->if_events.iphlen++;
 	} else {
 		if (hdr->frame_statusGB & VGBSTAT_XPERR) {
 			u32 xerr = hdr->frame_statusGB >> VGBSTAT_XERRSHFT;
 
 			if (xerr == VGBSTAT_XCSERR)
-				adapter->if_events.TpCsum++;
+				adapter->if_events.tpcsum++;
 			if (xerr == VGBSTAT_XUFLOW)
-				adapter->if_events.Tprtoflow++;
+				adapter->if_events.tprtoflow++;
 			if (xerr == VGBSTAT_XHLEN)
-				adapter->if_events.TpHlen++;
+				adapter->if_events.tphlen++;
 		}
 		if (hdr->frame_statusGB & VGBSTAT_NETERR) {
 			u32 nerr =
@@ -1971,11 +1971,11 @@ static void slic_rcv_handle_error(struct adapter *adapter,
 			     frame_statusGB >> VGBSTAT_NERRSHFT) &
 			    VGBSTAT_NERRMSK;
 			if (nerr == VGBSTAT_NCSERR)
-				adapter->if_events.IpCsum++;
+				adapter->if_events.ipcsum++;
 			if (nerr == VGBSTAT_NUFLOW)
-				adapter->if_events.IpLen++;
+				adapter->if_events.iplen++;
 			if (nerr == VGBSTAT_NHLEN)
-				adapter->if_events.IpHlen++;
+				adapter->if_events.iphlen++;
 		}
 		if (hdr->frame_statusGB & VGBSTAT_LNKERR) {
 			u32 lerr = hdr->frame_statusGB & VGBSTAT_LERRMSK;
@@ -1983,13 +1983,13 @@ static void slic_rcv_handle_error(struct adapter *adapter,
 			if (lerr == VGBSTAT_LDEARLY)
 				adapter->if_events.rcvearly++;
 			if (lerr == VGBSTAT_LBOFLO)
-				adapter->if_events.Bufov++;
+				adapter->if_events.bufov++;
 			if (lerr == VGBSTAT_LCODERR)
-				adapter->if_events.Code++;
+				adapter->if_events.code++;
 			if (lerr == VGBSTAT_LDBLNBL)
-				adapter->if_events.Drbl++;
+				adapter->if_events.drbl++;
 			if (lerr == VGBSTAT_LCRCERR)
-				adapter->if_events.Crc++;
+				adapter->if_events.crc++;
 			if (lerr == VGBSTAT_LOFLO)
 				adapter->if_events.oflow802++;
 			if (lerr == VGBSTAT_LUFLO)
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] staging: slicoss: fix camel case check
  2016-05-29 13:31 [PATCH 2/2] staging: slicoss: fix camel case check Jaime Arrocha
@ 2016-05-30 14:29 ` Luis de Bethencourt
  0 siblings, 0 replies; 2+ messages in thread
From: Luis de Bethencourt @ 2016-05-30 14:29 UTC (permalink / raw)
  To: Jaime Arrocha, gregkh; +Cc: devel, charrer, liodot, linux-kernel

On 29/05/16 14:31, Jaime Arrocha wrote:
> From: Jaime Arrocha <jarr@innercoder.com>
> 
> Fixed several checks about camel case use provided by checkpatch.pl.
> CHECK: Avoid CamelCase
> Changes verified to work by compiling module.
> 
> Signed-off-by: Jaime Arrocha <jarr@innercoder.com>

Purpose of the patch is good but it fails to apply in my clone of the staging-testing
branch. Not sure why.

Can you check it applies cleanly in your side?

Thanks,
Luis

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-30 14:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-29 13:31 [PATCH 2/2] staging: slicoss: fix camel case check Jaime Arrocha
2016-05-30 14:29 ` Luis de Bethencourt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).