mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michalis Pappas <mpappas@fastmail.fm>
To: Dan Carpenter <dan.carpenter@oracle.com>,
	Greg KH <gregkh@linuxfoundation.org>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 5/10] staging: gdm72xx: Fixed some camelCase variables
Date: Tue, 29 Apr 2014 10:13:46 +0800	[thread overview]
Message-ID: <535F0ADA.9070906@fastmail.fm> (raw)
In-Reply-To: <535F0866.2060207@fastmail.fm>


Fixed some camelCase variables

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
---
 drivers/staging/gdm72xx/gdm_qos.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c
index 519db48..465f695 100644
--- a/drivers/staging/gdm72xx/gdm_qos.c
+++ b/drivers/staging/gdm72xx/gdm_qos.c
@@ -142,24 +142,24 @@ void gdm_qos_release_list(void *nic_ptr)
 	free_qos_entry_list(&free_list);
 }
 
-static u32 chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *Stream, u8 *port)
+static u32 chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *stream, u8 *port)
 {
 	int i;
 
 	if (csr->classifier_rule_en&IPTYPEOFSERVICE) {
-		if (((Stream[1] & csr->ip2s_mask) < csr->ip2s_lo) ||
-		((Stream[1] & csr->ip2s_mask) > csr->ip2s_hi))
+		if (((stream[1] & csr->ip2s_mask) < csr->ip2s_lo) ||
+		((stream[1] & csr->ip2s_mask) > csr->ip2s_hi))
 			return 1;
 	}
 
 	if (csr->classifier_rule_en&PROTOCOL) {
-		if (Stream[9] != csr->protocol)
+		if (stream[9] != csr->protocol)
 			return 1;
 	}
 
 	if (csr->classifier_rule_en&IPMASKEDSRCADDRESS) {
 		for (i = 0; i < 4; i++) {
-			if ((Stream[12 + i] & csr->ipsrc_addrmask[i]) !=
+			if ((stream[12 + i] & csr->ipsrc_addrmask[i]) !=
 			(csr->ipsrc_addr[i] & csr->ipsrc_addrmask[i]))
 				return 1;
 		}
@@ -167,7 +167,7 @@ static u32 chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *Stream, u8 *port)
 
 	if (csr->classifier_rule_en&IPMASKEDDSTADDRESS) {
 		for (i = 0; i < 4; i++) {
-			if ((Stream[16 + i] & csr->ipdst_addrmask[i]) !=
+			if ((stream[16 + i] & csr->ipdst_addrmask[i]) !=
 			(csr->ipdst_addr[i] & csr->ipdst_addrmask[i]))
 				return 1;
 		}
@@ -190,16 +190,15 @@ static u32 chk_ipv4_rule(struct gdm_wimax_csr_s *csr, u8 *Stream, u8 *port)
 
 static u32 get_qos_index(struct nic *nic, u8 *iph, u8 *tcpudph)
 {
-	u32	IP_Ver, Header_Len, i;
+	u32	IP_ver, i;
 	struct qos_cb_s *qcb = &nic->qos;
 
 	if (iph == NULL || tcpudph == NULL)
 		return -1;
 
-	IP_Ver = (iph[0]>>4)&0xf;
-	Header_Len = iph[0]&0xf;
+	IP_ver = (iph[0]>>4)&0xf;
 
-	if (IP_Ver == 4) {
+	if (IP_ver == 4) {
 		for (i = 0; i < QOS_MAX; i++) {
 			if (qcb->csr[i].enabled) {
 				if (qcb->csr[i].classifier_rule_en) {
@@ -336,16 +335,16 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
 {
 	struct nic *nic = nic_ptr;
 	u32 i, SFID, index, pos;
-	u8 subCmdEvt;
+	u8 sub_cmd_evt;
 	struct qos_cb_s *qcb = &nic->qos;
 	struct qos_entry_s *entry, *n;
 	struct list_head send_list;
 	struct list_head free_list;
 	unsigned long flags;
 
-	subCmdEvt = (u8)buf[4];
+	sub_cmd_evt = (u8)buf[4];
 
-	if (subCmdEvt == QOS_REPORT) {
+	if (sub_cmd_evt == QOS_REPORT) {
 		spin_lock_irqsave(&qcb->qos_lock, flags);
 		for (i = 0; i < qcb->qos_list_cnt; i++) {
 			SFID = ((buf[(i*5)+6]<<24)&0xff000000);
@@ -367,7 +366,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
 		return;
 	}
 
-	/* subCmdEvt == QOS_ADD || subCmdEvt == QOS_CHANG_DEL */
+	/* sub_cmd_evt == QOS_ADD || sub_cmd_evt == QOS_CHANG_DEL */
 	pos = 6;
 	SFID = ((buf[pos++]<<24)&0xff000000);
 	SFID += ((buf[pos++]<<16)&0xff0000);
@@ -382,7 +381,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
 		return;
 	}
 
-	if (subCmdEvt == QOS_ADD) {
+	if (sub_cmd_evt == QOS_ADD) {
 		netdev_dbg(nic->netdev, "QOS_ADD SFID = 0x%x, index=%d\n",
 			   SFID, index);
 
@@ -423,7 +422,7 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
 
 		qcb->qos_limit_size = 254/qcb->qos_list_cnt;
 		spin_unlock_irqrestore(&qcb->qos_lock, flags);
-	} else if (subCmdEvt == QOS_CHANGE_DEL) {
+	} else if (sub_cmd_evt == QOS_CHANGE_DEL) {
 		netdev_dbg(nic->netdev, "QOS_CHANGE_DEL SFID = 0x%x, index=%d\n",
 			   SFID, index);
 
-- 
1.8.4


  parent reply	other threads:[~2014-04-29  2:14 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-21  8:34 [PATCH 0/3] staging: gdm72xx: Minor cleanup Michalis Pappas
2014-03-21  8:36 ` [PATCH 1/3] staging: gdm72xx: Coding style fixes Michalis Pappas
2014-03-21  8:37 ` [PATCH 2/3] staging: gdm72xx: Removed task from TODO list Michalis Pappas
2014-03-21  8:39 ` [PATCH 3/3] staging: gdm72xx: Removed direct comparisons on jiffies Michalis Pappas
2014-04-18 22:52 ` [PATCH 0/3] staging: gdm72xx: Minor cleanup Greg KH
2014-04-20  3:34   ` [PATCH v2 " Michalis Pappas
2014-04-20  3:35     ` [PATCH v2 1/3] " Michalis Pappas
2014-04-20  3:36     ` [PATCH v2 2/3] " Michalis Pappas
2014-04-22  9:32       ` Dan Carpenter
2014-04-20  3:37     ` [PATCH v2 3/3] " Michalis Pappas
2014-04-22  9:37       ` Dan Carpenter
2014-04-23  0:39         ` [PATCH v3 0/3] " Michalis Pappas
2014-04-23  0:40           ` [PATCH v3 1/3] staging: gdm72xx: Coding style fixes Michalis Pappas
2014-04-23  0:44           ` [PATCH v3 2/3] staging: gdm72xx: Removed completed task from TODO list Michalis Pappas
2014-04-23  0:45           ` [PATCH v3 3/3] staging: gdm72xx: Removed direct comparisons on jiffies Michalis Pappas
2014-04-23  8:04           ` [PATCH v3 0/3] staging: gdm72xx: Minor cleanup Dan Carpenter
2014-04-23  8:49             ` Michalis Pappas
2014-04-23  9:05               ` Dan Carpenter
2014-04-23  9:09                 ` Dan Carpenter
2014-04-29  2:03                   ` [PATCH v4 0/3] staging: gdm72xx: Code cleanup Michalis Pappas
2014-04-29  2:05                     ` [PATCH v4 1/10] staging: gdm72xx: Removed unnecessary extern declarations from header files Michalis Pappas
2014-04-29  2:07                     ` [PATCH v4 2/10] staging: gdm72xx: Replaced comparisons on jiffies values with wrap-safe functions Michalis Pappas
2014-04-29  2:09                     ` [PATCH v4 3/10] staging: gdm72xx: Modified struct allocation to match coding standards Michalis Pappas
2014-04-29  2:11                     ` [PATCH v4 4/10] staging: gdm72xx: Moved logical continuation to previous line to conform to coding style Michalis Pappas
2014-04-29  2:13                     ` Michalis Pappas [this message]
2014-04-29  2:15                     ` [PATCH v4 6/10] staging: gdm72xx: Fixed some braces to conform with " Michalis Pappas
2014-04-29  2:17                     ` [PATCH v4 7/10] staging: gdm72xx: Removed commented-out code Michalis Pappas
2014-04-29  2:20                     ` [PATCH v4 8/10] staging: gdm72xx: Whitespace fixes to conform to coding standards Michalis Pappas
2014-04-29  2:22                     ` [PATCH v4 9/10] staging: gdm72xx: Indentation and other whitespace fixes Michalis Pappas
2014-04-29  2:23                     ` [PATCH v4 10/10] staging: gdm72xx: Removed task from TODO list Michalis Pappas
2014-05-09 10:05                     ` [PATCH v5 0/10] staging: gdm72xx: Code cleanup Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 01/10] staging: gdm72xx: Remove unnecessary extern declarations from header files Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 02/10] staging: gdm72xx: Replace comparisons on jiffies values with wrap-safe functions Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 03/10] staging: gdm72xx: Modify a struct allocation to match coding standards Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 04/10] staging: gdm72xx: Move logical continuation to previous line to conform to coding style Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 05/10] staging: gdm72xx: Fix some camel-case variables Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 06/10] staging: gdm72xx: Fix braces to conform with coding style Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 07/10] staging: gdm72xx: Removed commented-out code Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 08/10] staging: gdm72xx: Whitespace fixes to conform to coding standards Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 09/10] staging: gdm72xx: Indentation and other whitespace fixes Michalis Pappas
2014-05-09 10:08                       ` [PATCH v5 10/10] staging: gdm72xx: Remove task from TODO list Michalis Pappas

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=535F0ADA.9070906@fastmail.fm \
    --to=mpappas@fastmail.fm \
    --cc=dan.carpenter@oracle.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome