Skip to content

Commit

Permalink
staging: rtl8192u: fix checkpatch.pl issues to line 514
Browse files Browse the repository at this point in the history 
Fixed most problems pointed out by checkpatch.pl in file r8192U_core.c
up to line 500

Signed-off-by: Mike Gilks <mike.kernel@gilksonline.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Mike Gilks authored and Greg Kroah-Hartman committed Jun 18, 2010
1 parent 70eef90 commit 616f58f
Showing 1 changed file with 28 additions and 45 deletions.
73 changes: 28 additions & 45 deletions drivers/staging/rtl8192u/r8192U_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,12 @@ u16 read_nic_word(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, 2, HZ / 2);
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
(indx&0xff)|0xff00, (indx>>8)&0x0f,
&data, 2, HZ / 2);

if (status < 0)
{
printk("read_nic_word TimeOut! status:%d\n", status);
}


return data;
}
Expand All @@ -429,13 +427,10 @@ u16 read_nic_word_E(struct net_device *dev, int indx)

status = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
indx|0xfe00, 0, &data, 2, HZ / 2);
indx|0xfe00, 0, &data, 2, HZ / 2);

if (status < 0)
{
printk("read_nic_word TimeOut! status:%d\n", status);
}


return data;
}
Expand All @@ -444,58 +439,52 @@ u32 read_nic_dword(struct net_device *dev, int indx)
{
u32 data;
int status;
// int result;
/* int result; */

struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
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, 4, HZ / 2);
// if(0 != result) {
// printk(KERN_WARNING "read size of data = %d\, date = %d\n", result, data);
// }
RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
(indx&0xff)|0xff00, (indx>>8)&0x0f,
&data, 4, HZ / 2);
/* if(0 != result) {
* printk(KERN_WARNING "read size of data = %d\, date = %d\n",
* result, data);
* }
*/

if (status < 0)
{
printk("read_nic_dword TimeOut! status:%d\n", status);
}



return data;
}


//u8 read_phy_cck(struct net_device *dev, u8 adr);
//u8 read_phy_ofdm(struct net_device *dev, u8 adr);
/* u8 read_phy_cck(struct net_device *dev, u8 adr); */
/* u8 read_phy_ofdm(struct net_device *dev, u8 adr); */
/* this might still called in what was the PHY rtl8185/rtl8192 common code
* plans are to possibilty turn it again in one common code...
*/
inline void force_pci_posting(struct net_device *dev)
{
}


static struct net_device_stats *rtl8192_stats(struct net_device *dev);
void rtl8192_commit(struct net_device *dev);
//void rtl8192_restart(struct net_device *dev);
/* void rtl8192_restart(struct net_device *dev); */
void rtl8192_restart(struct work_struct *work);
//void rtl8192_rq_tx_ack(struct work_struct *work);

/* void rtl8192_rq_tx_ack(struct work_struct *work); */
void watch_dog_timer_callback(unsigned long data);

/****************************************************************************
-----------------------------PROCFS STUFF-------------------------
*****************************************************************************/

static struct proc_dir_entry *rtl8192_proc = NULL;

* -----------------------------PROCFS STUFF-------------------------
*****************************************************************************
*/

static struct proc_dir_entry *rtl8192_proc;

static int proc_get_stats_ap(char *page, char **start,
off_t offset, int count,
int *eof, void *data)
static int proc_get_stats_ap(char *page, char **start, off_t offset, int count,
int *eof, void *data)
{
struct net_device *dev = data;
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
Expand All @@ -506,18 +495,12 @@ static int proc_get_stats_ap(char *page, char **start,

list_for_each_entry(target, &ieee->network_list, list) {

len += snprintf(page + len, count - len,
"%s ", target->ssid);

if(target->wpa_ie_len>0 || target->rsn_ie_len>0){
len += snprintf(page + len, count - len,
"WPA\n");
}
else{
len += snprintf(page + len, count - len,
"non_WPA\n");
}
len += snprintf(page + len, count - len, "%s ", target->ssid);

if (target->wpa_ie_len > 0 || target->rsn_ie_len > 0)
len += snprintf(page + len, count - len, "WPA\n");
else
len += snprintf(page + len, count - len, "non_WPA\n");
}

*eof = 1;
Expand Down

0 comments on commit 616f58f

Please sign in to comment.