evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John Church <j.church@ymail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
John Church 2010-04-08 16:04:17 -05:00 • committed by Greg Kroah-Hartman
parent a5e135b1f5
commit cb73da2524
1 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/staging/rtl8187se/r8180_core.c
View file

@ -61,7 +61,7 @@ static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = {
}; };
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 = {
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);
} }
@ -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;
@ -2292,10 +2292,10 @@ 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)
@ -2956,7 +2956,7 @@ 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;
@ -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;
@ -4091,7 +4091,7 @@ 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";