Skip to content

L
linux
Commit cb73da25 authored by John Church's avatar John Church Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rtl8187se: fix coding style issues in r8180_core.c 

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn Church <j.church@ymail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a5e135b1
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
drivers/staging/rtl8187se/r8180_core.c
View file @ cb73da25
...@@ -44,24 +44,24 @@ ...@@ -44,24 +44,24 @@
#include "ieee80211/dot11d.h" #include "ieee80211/dot11d.h"
static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = { static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = {
{ {
.vendor = PCI_VENDOR_ID_REALTEK, .vendor = PCI_VENDOR_ID_REALTEK,
.device = 0x8199, .device = 0x8199,
.subvendor = PCI_ANY_ID, .subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
.driver_data = 0, .driver_data = 0,
}, },
{ {
.vendor = 0, .vendor = 0,
.device = 0, .device = 0,
.subvendor = 0, .subvendor = 0,
.subdevice = 0, .subdevice = 0,
.driver_data = 0, .driver_data = 0,
} }
}; };
static char* ifname = "wlan%d"; static char *ifname = "wlan%d";
static int hwseqnum = 0; static int hwseqnum = 0;
static int hwwep = 0; static int hwwep = 0;
static int channels = 0x3fff; static int channels = 0x3fff;
...@@ -168,34 +168,34 @@ static struct pci_driver rtl8180_pci_driver = { ...@@ -168,34 +168,34 @@ static struct pci_driver rtl8180_pci_driver = {
u8 read_nic_byte(struct net_device *dev, int x) u8 read_nic_byte(struct net_device *dev, int x)
{ {
return 0xff&readb((u8*)dev->mem_start +x); return 0xff&readb((u8 *)dev->mem_start + x);
} }
u32 read_nic_dword(struct net_device *dev, int x) u32 read_nic_dword(struct net_device *dev, int x)
{ {
return readl((u8*)dev->mem_start +x); return readl((u8 *)dev->mem_start + x);
} }
u16 read_nic_word(struct net_device *dev, int x) u16 read_nic_word(struct net_device *dev, int x)
{ {
return readw((u8*)dev->mem_start +x); return readw((u8 *)dev->mem_start + x);
} }
void write_nic_byte(struct net_device *dev, int x,u8 y) void write_nic_byte(struct net_device *dev, int x,u8 y)
{ {
writeb(y,(u8*)dev->mem_start +x); writeb(y, (u8 *)dev->mem_start + x);
udelay(20); udelay(20);
} }
void write_nic_dword(struct net_device *dev, int x,u32 y) void write_nic_dword(struct net_device *dev, int x,u32 y)
{ {
writel(y,(u8*)dev->mem_start +x); writel(y, (u8 *)dev->mem_start + x);
udelay(20); udelay(20);
} }
void write_nic_word(struct net_device *dev, int x,u16 y) void write_nic_word(struct net_device *dev, int x,u16 y)
{ {
writew(y,(u8*)dev->mem_start +x); writew(y, (u8 *)dev->mem_start + x);
udelay(20); udelay(20);
} }
...@@ -313,7 +313,7 @@ void rtl8180_proc_module_init(void) ...@@ -313,7 +313,7 @@ void rtl8180_proc_module_init(void)
void rtl8180_proc_module_remove(void) void rtl8180_proc_module_remove(void)
{ {
remove_proc_entry(RTL8180_MODULE_NAME, init_net.proc_net); remove_proc_entry(RTL8180_MODULE_NAME, init_net.proc_net);
} }
void rtl8180_proc_remove_one(struct net_device *dev) void rtl8180_proc_remove_one(struct net_device *dev)
...@@ -383,7 +383,7 @@ void rtl8180_proc_init_one(struct net_device *dev) ...@@ -383,7 +383,7 @@ void rtl8180_proc_init_one(struct net_device *dev)
short buffer_add(struct buffer **buffer, u32 *buf, dma_addr_t dma, short buffer_add(struct buffer **buffer, u32 *buf, dma_addr_t dma,
struct buffer **bufferhead) struct buffer **bufferhead)
{ {
struct buffer *tmp; struct buffer *tmp;
if(! *buffer){ if(! *buffer){
...@@ -1429,7 +1429,7 @@ void rtl8180_rx(struct net_device *dev) ...@@ -1429,7 +1429,7 @@ void rtl8180_rx(struct net_device *dev)
u32 RXAGC = 0; u32 RXAGC = 0;
long RxAGC_dBm = 0; long RxAGC_dBm = 0;
u8 LNA=0, BB=0; u8 LNA=0, BB=0;
u8 LNA_gain[4]={02, 17, 29, 39}; u8 LNA_gain[4] = {02, 17, 29, 39};
u8 Antenna = 0; u8 Antenna = 0;
struct ieee80211_hdr_4addr *hdr; struct ieee80211_hdr_4addr *hdr;
u16 fc,type; u16 fc,type;
...@@ -1531,7 +1531,7 @@ void rtl8180_rx(struct net_device *dev) ...@@ -1531,7 +1531,7 @@ void rtl8180_rx(struct net_device *dev)
}else { }else {
padding = 0; padding = 0;
} }
padding = 0; padding = 0;
priv->rx_prevlen+=len; priv->rx_prevlen+=len;
if(priv->rx_prevlen > MAX_FRAG_THRESHOLD + 100){ if(priv->rx_prevlen > MAX_FRAG_THRESHOLD + 100){
...@@ -1624,7 +1624,7 @@ void rtl8180_rx(struct net_device *dev) ...@@ -1624,7 +1624,7 @@ void rtl8180_rx(struct net_device *dev)
bICV = ((*(priv->rxringtail)) & (0x00001000)) >> 12; bICV = ((*(priv->rxringtail)) & (0x00001000)) >> 12;
hdr = (struct ieee80211_hdr_4addr *)priv->rxbuffer->buf; hdr = (struct ieee80211_hdr_4addr *)priv->rxbuffer->buf;
fc = le16_to_cpu(hdr->frame_ctl); fc = le16_to_cpu(hdr->frame_ctl);
type = WLAN_FC_GET_TYPE(fc); type = WLAN_FC_GET_TYPE(fc);
if((IEEE80211_FTYPE_CTL != type) && if((IEEE80211_FTYPE_CTL != type) &&
(eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS)? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS )? hdr->addr2 : hdr->addr3)) (eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS)? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS )? hdr->addr2 : hdr->addr3))
...@@ -1948,11 +1948,11 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, ...@@ -1948,11 +1948,11 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
u8 bUseShortPreamble = 0; u8 bUseShortPreamble = 0;
u8 bCTSEnable = 0; u8 bCTSEnable = 0;
u8 bRTSEnable = 0; u8 bRTSEnable = 0;
u16 Duration = 0; u16 Duration = 0;
u16 RtsDur = 0; u16 RtsDur = 0;
u16 ThisFrameTime = 0; u16 ThisFrameTime = 0;
u16 TxDescDuration = 0; u16 TxDescDuration = 0;
u8 ownbit_flag = false; u8 ownbit_flag = false;
switch(priority) { switch(priority) {
case MANAGE_PRIORITY: case MANAGE_PRIORITY:
...@@ -2000,7 +2000,7 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, ...@@ -2000,7 +2000,7 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
default: default:
return -1; return -1;
break; break;
} }
memcpy(&dest, frag_hdr->addr1, ETH_ALEN); memcpy(&dest, frag_hdr->addr1, ETH_ALEN);
if (is_multicast_ether_addr(dest) || if (is_multicast_ether_addr(dest) ||
...@@ -2151,8 +2151,8 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, ...@@ -2151,8 +2151,8 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
if(morefrag) *tail = (*tail) | (1<<17); // more fragment if(morefrag) *tail = (*tail) | (1<<17); // more fragment
if(!remain) *tail = (*tail) | (1<<28); // last segment of frame if(!remain) *tail = (*tail) | (1<<28); // last segment of frame
*(tail+5) = *(tail+5)|(2<<27); *(tail+5) = *(tail+5)|(2<<27);
*(tail+7) = *(tail+7)|(1<<4); *(tail+7) = *(tail+7)|(1<<4);
wmb(); wmb();
if(ownbit_flag) if(ownbit_flag)
...@@ -2289,13 +2289,13 @@ void rtl8180_hw_wakeup(struct net_device *dev) ...@@ -2289,13 +2289,13 @@ void rtl8180_hw_wakeup(struct net_device *dev)
void rtl8180_hw_sleep_down(struct net_device *dev) void rtl8180_hw_sleep_down(struct net_device *dev)
{ {
unsigned long flags; unsigned long flags;
struct r8180_priv *priv = ieee80211_priv(dev); struct r8180_priv *priv = ieee80211_priv(dev);
spin_lock_irqsave(&priv->ps_lock,flags); spin_lock_irqsave(&priv->ps_lock, flags);
if(priv->rf_sleep) if (priv->rf_sleep)
priv->rf_sleep(dev); priv->rf_sleep(dev);
spin_unlock_irqrestore(&priv->ps_lock,flags); spin_unlock_irqrestore(&priv->ps_lock, flags);
} }
void rtl8180_hw_sleep(struct net_device *dev, u32 th, u32 tl) void rtl8180_hw_sleep(struct net_device *dev, u32 th, u32 tl)
...@@ -2786,7 +2786,7 @@ short rtl8180_init(struct net_device *dev) ...@@ -2786,7 +2786,7 @@ short rtl8180_init(struct net_device *dev)
priv->ieee80211->data_hard_stop = rtl8180_data_hard_stop; priv->ieee80211->data_hard_stop = rtl8180_data_hard_stop;
priv->ieee80211->data_hard_resume = rtl8180_data_hard_resume; priv->ieee80211->data_hard_resume = rtl8180_data_hard_resume;
priv->ieee80211->init_wmmparam_flag = 0; priv->ieee80211->init_wmmparam_flag = 0;
priv->ieee80211->start_send_beacons = rtl8180_start_tx_beacon; priv->ieee80211->start_send_beacons = rtl8180_start_tx_beacon;
priv->ieee80211->stop_send_beacons = rtl8180_beacon_tx_disable; priv->ieee80211->stop_send_beacons = rtl8180_beacon_tx_disable;
...@@ -2956,8 +2956,8 @@ short rtl8180_init(struct net_device *dev) ...@@ -2956,8 +2956,8 @@ short rtl8180_init(struct net_device *dev)
return -ENOMEM; return -ENOMEM;
if(request_irq(dev->irq, (void *)rtl8180_interrupt, IRQF_SHARED, dev->name, dev)){ if(request_irq(dev->irq, (void *)rtl8180_interrupt, IRQF_SHARED, dev->name, dev)){
DMESGE("Error allocating IRQ %d",dev->irq); DMESGE("Error allocating IRQ %d", dev->irq);
return -1; return -1;
}else{ }else{
priv->irq=dev->irq; priv->irq=dev->irq;
DMESG("IRQ %d",dev->irq); DMESG("IRQ %d",dev->irq);
...@@ -3102,7 +3102,7 @@ void rtl8185_set_rate(struct net_device *dev) ...@@ -3102,7 +3102,7 @@ void rtl8185_set_rate(struct net_device *dev)
void rtl8180_adapter_start(struct net_device *dev) void rtl8180_adapter_start(struct net_device *dev)
{ {
struct r8180_priv *priv = ieee80211_priv(dev); struct r8180_priv *priv = ieee80211_priv(dev);
rtl8180_rtx_disable(dev); rtl8180_rtx_disable(dev);
rtl8180_reset(dev); rtl8180_reset(dev);
...@@ -3196,7 +3196,7 @@ void rtl8180_start_tx_beacon(struct net_device *dev) ...@@ -3196,7 +3196,7 @@ void rtl8180_start_tx_beacon(struct net_device *dev)
rtl8180_set_mode(dev, EPROM_CMD_NORMAL); rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
rtl8185b_irq_enable(dev); rtl8185b_irq_enable(dev);
} }
static struct net_device_stats *rtl8180_stats(struct net_device *dev) static struct net_device_stats *rtl8180_stats(struct net_device *dev)
...@@ -3252,9 +3252,9 @@ void rtl8180_hw_sleep_wq (struct work_struct *work) ...@@ -3252,9 +3252,9 @@ void rtl8180_hw_sleep_wq (struct work_struct *work)
{ {
struct delayed_work *dwork = to_delayed_work(work); struct delayed_work *dwork = to_delayed_work(work);
struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_sleep_wq); struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_sleep_wq);
struct net_device *dev = ieee->dev; struct net_device *dev = ieee->dev;
rtl8180_hw_sleep_down(dev); rtl8180_hw_sleep_down(dev);
} }
static void MgntLinkKeepAlive(struct r8180_priv *priv ) static void MgntLinkKeepAlive(struct r8180_priv *priv )
...@@ -3373,7 +3373,7 @@ int _rtl8180_up(struct net_device *dev) ...@@ -3373,7 +3373,7 @@ int _rtl8180_up(struct net_device *dev)
} }
timer_rate_adaptive((unsigned long)dev); timer_rate_adaptive((unsigned long)dev);
watch_dog_adaptive((unsigned long)dev); watch_dog_adaptive((unsigned long)dev);
if(priv->bSwAntennaDiverity) if (priv->bSwAntennaDiverity)
SwAntennaDiversityTimerCallback(dev); SwAntennaDiversityTimerCallback(dev);
ieee80211_softmac_start_protocol(priv->ieee80211); ieee80211_softmac_start_protocol(priv->ieee80211);
return 0; return 0;
...@@ -3614,10 +3614,10 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, ...@@ -3614,10 +3614,10 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev,
dev->watchdog_timeo = HZ*3; dev->watchdog_timeo = HZ*3;
if (dev_alloc_name(dev, ifname) < 0){ if (dev_alloc_name(dev, ifname) < 0){
DMESG("Oops: devname already taken! Trying wlan%%d...\n"); DMESG("Oops: devname already taken! Trying wlan%%d...\n");
ifname = "wlan%d"; ifname = "wlan%d";
dev_alloc_name(dev, ifname); dev_alloc_name(dev, ifname);
} }
if(rtl8180_init(dev)!=0){ if(rtl8180_init(dev)!=0){
DMESG("Initialization failed"); DMESG("Initialization failed");
...@@ -4091,10 +4091,10 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work) ...@@ -4091,10 +4091,10 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work)
u8 btPSR; u8 btPSR;
u8 btConfig0; u8 btConfig0;
RT_RF_POWER_STATE eRfPowerStateToSet; RT_RF_POWER_STATE eRfPowerStateToSet;
bool bActuallySet=false; bool bActuallySet = false;
char *argv[3]; char *argv[3];
static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh"; static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh";
static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL}; static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL};
static int readf_count = 0; static int readf_count = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7