From: Mike Gilks <mike.kernel@gilksonline.com>
To: gregkh@suse.de, mchehab@redhat.com, julia@diku.dk, joe@perches.com
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Mike Gilks <kernel.online@gilksonline.com>
Subject: [PATCH 06/13] fixed checkpatch.pl issues to line 300
Date: Sat, 5 Jun 2010 22:12:30 +0800 [thread overview]
Message-ID: <1275747158-31375-7-git-send-email-mike.kernel@gilksonline.com> (raw)
In-Reply-To: <1275747158-31375-6-git-send-email-mike.kernel@gilksonline.com>
From: Mike Gilks <kernel.online@gilksonline.com>
---
drivers/staging/rtl8192u/r8192U_core.c | 56 +++++++++++++-------------------
1 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 7bfbbfe..ac620a5 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -236,7 +236,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
if (ChannelPlan[channel_plan].Channel[i] <
min_chan || ChannelPlan[channel_plan].
Channel[i] > max_chan)
- break;
+ break;
GET_DOT11D_INFO(ieee)->channel_map[ChannelPlan
[channel_plan].Channel[i]] = 1;
}
@@ -268,7 +268,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
_pdrvinfo->RxRate == DESC90_RATE2M ||\
_pdrvinfo->RxRate == DESC90_RATE5_5M ||\
_pdrvinfo->RxRate == DESC90_RATE11M) &&\
- !_pdrvinfo->RxHT\
+ !_pdrvinfo->RxHT
void CamResetAllEntry(struct net_device *dev)
@@ -285,8 +285,7 @@ void CamResetAllEntry(struct net_device *dev)
*/
/* debug
*DbgPrint("========================================\n");
- *DbgPrint(" Call ResetAllEntry"
- * " \n");
+ *DbgPrint(" Call ResetAllEntry\n");
*DbgPrint("========================================\n\n");
*/
ulcommand |= BIT31|BIT30;
@@ -297,12 +296,12 @@ void CamResetAllEntry(struct net_device *dev)
void write_cam(struct net_device *dev, u8 addr, u32 data)
{
write_nic_dword(dev, WCAMI, data);
- write_nic_dword(dev, RWCAM, BIT31|BIT16|(addr&0xff) );
+ write_nic_dword(dev, RWCAM, BIT31|BIT16|(addr&0xff));
}
u32 read_cam(struct net_device *dev, u8 addr)
{
- write_nic_dword(dev, RWCAM, 0x80000000|(addr&0xff) );
+ write_nic_dword(dev, RWCAM, 0x80000000|(addr&0xff));
return read_nic_dword(dev, 0xa8);
}
@@ -316,8 +315,7 @@ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
indx|0xfe00, 0, &data, 1, HZ / 2);
- if (status < 0)
- {
+ if (status < 0) {
printk("write_nic_byte_E TimeOut! status:%d\n", status);
}
}
@@ -333,14 +331,14 @@ u8 read_nic_byte_E(struct net_device *dev, int indx)
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
indx|0xfe00, 0, &data, 1, HZ / 2);
- if (status < 0)
- {
+ if (status < 0) {
printk("read_nic_byte_E TimeOut! status:%d\n", status);
}
return data;
}
-//as 92U has extend page from 4 to 16, so modify functions below.
+
+/* as 92U has extend page from 4 to 16, so modify functions below. */
void write_nic_byte(struct net_device *dev, int indx, u8 data)
{
int status;
@@ -350,20 +348,18 @@ void write_nic_byte(struct net_device *dev, int indx, u8 data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
- (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 1, HZ / 2);
+ (indx&0xff)|0xff00, (indx>>8)&0x0f,
+ &data, 1, HZ / 2);
- if (status < 0)
- {
+ if (status < 0) {
printk("write_nic_byte TimeOut! status:%d\n", status);
}
}
-
void write_nic_word(struct net_device *dev, int indx, u16 data)
{
-
int status;
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
@@ -371,34 +367,30 @@ void write_nic_word(struct net_device *dev, int indx, u16 data)
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
- (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 2, HZ / 2);
+ (indx&0xff)|0xff00, (indx>>8)&0x0f,
+ &data, 2, HZ / 2);
- if (status < 0)
- {
+ if (status < 0) {
printk("write_nic_word TimeOut! status:%d\n", status);
}
}
-
void write_nic_dword(struct net_device *dev, int indx, u32 data)
{
-
int status;
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
struct usb_device *udev = priv->udev;
status = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
- RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
- (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 4, HZ / 2);
+ RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ (indx&0xff)|0xff00, (indx>>8)&0x0f,
+ &data, 4, HZ / 2);
-
- if (status < 0)
- {
+ if (status < 0) {
printk("write_nic_dword TimeOut! status:%d\n", status);
}
-
}
@@ -411,19 +403,17 @@ u8 read_nic_byte(struct net_device *dev, int indx)
struct usb_device *udev = priv->udev;
status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
- RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
- (indx&0xff)|0xff00, (indx>>8)&0x0f, &data, 1, HZ / 2);
+ RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ (indx&0xff)|0xff00, (indx>>8)&0x0f,
+ &data, 1, HZ / 2);
- if (status < 0)
- {
+ if (status < 0) {
printk("read_nic_byte TimeOut! status:%d\n", status);
}
return data;
}
-
-
u16 read_nic_word(struct net_device *dev, int indx)
{
u16 data;
--
1.6.3.3
next prev parent reply other threads:[~2010-06-05 14:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 14:12 patches to file r8192U_core.c Mike Gilks
2010-06-05 14:12 ` [PATCH 01/13] Linux 2.6.35-rc1 Mike Gilks
2010-06-05 14:12 ` [PATCH 02/13] Fixed checkpatch.pl issues to Line 172 Mike Gilks
2010-06-05 14:12 ` [PATCH 03/13] Remove checkpath.pl issues to line 200 Mike Gilks
2010-06-05 14:12 ` [PATCH 04/13] Remove references to __FUNCTION__ Checkpatch.pl issues to line 250 removed Mike Gilks
2010-06-05 14:12 ` [PATCH 05/13] checkpatch.pl issues removed to line 296 Mike Gilks
2010-06-05 14:12 ` Mike Gilks [this message]
2010-06-05 14:12 ` [PATCH 07/13] fix most checkpatch.pl issues to line 400 Mike Gilks
2010-06-05 14:12 ` [PATCH 08/13] staging: rtl8192u: fix checkpatch.pl issues to line 514 Mike Gilks
2010-06-05 14:12 ` [PATCH 09/13] staging: rtl8192u: fix checkpatch.pl issues to line 800 Fixed most problems pointed out by checkpatch.pl in file r8192U_core.c up to line 800 Mike Gilks
2010-06-05 14:12 ` [PATCH 10/13] staging: rtl8192u: fix c99 issues in file r8192U_core.c to line 3000 This is a patch to r8192U_core.c file to begin to rid the file of c99 style comments Mike Gilks
2010-06-05 14:12 ` [PATCH 11/13] staging: rtl8192u: remove C99 comments to line 4500 in file rtl8192U_core.c Patch to continue removal of all C99 style comments in file rtl8192U_core.c Fixed up until line 4588 Mike Gilks
2010-06-05 14:12 ` [PATCH 12/13] staging: rtl8192u: remove C99 comments in file r8192U_core.c Patch to remove C99 style comments from file r8192U_core.c Completed until line 5072 Mike Gilks
2010-06-05 14:12 ` [PATCH 13/13] staging: rtl8192u: remove all C99 style comments from file r8192U_core This patch removes all C99 comments from file rtl8192U_core.c Mike Gilks
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=1275747158-31375-7-git-send-email-mike.kernel@gilksonline.com \
--to=mike.kernel@gilksonline.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=joe@perches.com \
--cc=julia@diku.dk \
--cc=kernel.online@gilksonline.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®