From: Jaime Arrocha <jarr@innercoder.com>
To: gregkh@linuxfoundation.org
Cc: liodot@gmail.com, charrer@alacritech.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Jaime Arrocha <jarr@innercoder.com>
Subject: [PATCH 2/2] staging: slicoss: fix camel case check
Date: Sun, 29 May 2016 08:31:20 -0500 [thread overview]
Message-ID: <1464528680-6692-1-git-send-email-jarr@innercoder.com> (raw)
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
next reply other threads:[~2016-05-29 13:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-29 13:31 Jaime Arrocha [this message]
2016-05-30 14:29 ` [PATCH 2/2] staging: slicoss: fix camel case check Luis de Bethencourt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464528680-6692-1-git-send-email-jarr@innercoder.com \
--to=jarr@innercoder.com \
--cc=charrer@alacritech.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liodot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.