2012-11-22 19:10:18

by YAMANE Toshiaki

[permalink] [raw]
Subject: [PATCH 1/4] staging/rtl8187se: Remove the unnecessary initialization of a local variable in r8180_core.c

The following errors fixed.
- ERROR: do not initialise statics to 0 or NULL

Signed-off-by: YAMANE Toshiaki <[email protected]>
---
drivers/staging/rtl8187se/r8180_core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index ea04eec..ea8dbb1 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -62,7 +62,7 @@ static struct pci_device_id rtl8180_pci_id_tbl[] __devinitdata = {
};

static char ifname[IFNAMSIZ] = "wlan%d";
-static int hwwep = 0;
+static int hwwep;

MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, rtl8180_pci_id_tbl);
@@ -201,7 +201,7 @@ static struct net_device_stats *rtl8180_stats(struct net_device *dev);
void rtl8180_commit(struct net_device *dev);
void rtl8180_start_tx_beacon(struct net_device *dev);

-static struct proc_dir_entry *rtl8180_proc = NULL;
+static struct proc_dir_entry *rtl8180_proc;

static int proc_get_registers(char *page, char **start,
off_t offset, int count,
@@ -3725,7 +3725,7 @@ void GPIOChangeRFWorkItemCallBack(struct work_struct *work)
char *argv[3];
static char *RadioPowerPath = "/etc/acpi/events/RadioPower.sh";
static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", NULL};
- static int readf_count = 0;
+ static int readf_count;

readf_count = (readf_count+1)%0xffff;
/* We should turn off LED before polling FF51[4]. */
--
1.7.9.5


2012-11-22 18:59:23

by YAMANE Toshiaki

[permalink] [raw]
Subject: [PATCH 4/4] staging/rtl8187se: Use dev_ or pr_ printks in r8180_core.c

The following warnings fixed.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(... to printk(KERN_WARNING ...

Signed-off-by: YAMANE Toshiaki <[email protected]>
---
drivers/staging/rtl8187se/r8180_core.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 3119fe6..0aa2a78 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -27,6 +27,8 @@
Written by Mariusz Matuszek.
*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#undef RX_DONT_PASS_UL
#undef DUMMY_RX

@@ -116,8 +118,7 @@ static int rtl8180_resume(struct pci_dev *pdev)

err = pci_enable_device(pdev);
if (err) {
- printk(KERN_ERR "%s: pci_enable_device failed on resume\n",
- dev->name);
+ dev_err(&pdev->dev, "pci_enable_device failed on resume\n");

return err;
}
@@ -2154,7 +2155,8 @@ void rtl8180_wmm_param_update(struct work_struct *work)
write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);
break;
default:
- printk(KERN_WARNING "SetHwReg8185():invalid ACI: %d!\n", eACI);
+ pr_warn("SetHwReg8185():invalid ACI: %d!\n",
+ eACI);
break;
}
}
@@ -2193,7 +2195,8 @@ void rtl8180_wmm_param_update(struct work_struct *work)
write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);
break;
default:
- printk(KERN_WARNING "SetHwReg8185(): invalid ACI: %d !\n", eACI);
+ pr_warn("SetHwReg8185(): invalid ACI: %d !\n",
+ eACI);
break;
}
}
@@ -3339,27 +3342,27 @@ static int __init rtl8180_pci_module_init(void)

ret = ieee80211_crypto_init();
if (ret) {
- printk(KERN_ERR "ieee80211_crypto_init() failed %d\n", ret);
+ pr_err("ieee80211_crypto_init() failed %d\n", ret);
return ret;
}
ret = ieee80211_crypto_tkip_init();
if (ret) {
- printk(KERN_ERR "ieee80211_crypto_tkip_init() failed %d\n", ret);
+ pr_err("ieee80211_crypto_tkip_init() failed %d\n", ret);
return ret;
}
ret = ieee80211_crypto_ccmp_init();
if (ret) {
- printk(KERN_ERR "ieee80211_crypto_ccmp_init() failed %d\n", ret);
+ pr_err("ieee80211_crypto_ccmp_init() failed %d\n", ret);
return ret;
}
ret = ieee80211_crypto_wep_init();
if (ret) {
- printk(KERN_ERR "ieee80211_crypto_wep_init() failed %d\n", ret);
+ pr_err("ieee80211_crypto_wep_init() failed %d\n", ret);
return ret;
}

- printk(KERN_INFO "\nLinux kernel driver for RTL8180 / RTL8185 based WLAN cards\n");
- printk(KERN_INFO "Copyright (c) 2004-2005, Andrea Merello\n");
+ pr_info("\nLinux kernel driver for RTL8180 / RTL8185 based WLAN cards\n");
+ pr_info("Copyright (c) 2004-2005, Andrea Merello\n");
DMESG("Initializing module");
DMESG("Wireless extensions version %d", WIRELESS_EXT);
rtl8180_proc_module_init();
--
1.7.9.5

2012-11-22 19:25:59

by YAMANE Toshiaki

[permalink] [raw]
Subject: [PATCH 2/4] staging/rtl8187se: Remove an unnecessary line continuation in r8180_core.c

The following warnings fixed.
- WARNING: Avoid unnecessary line continuations

Signed-off-by: YAMANE Toshiaki <[email protected]>
---
drivers/staging/rtl8187se/r8180_core.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index ea8dbb1..8c8b09d 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -713,8 +713,8 @@ void rtl8180_rtx_disable(struct net_device *dev)
struct r8180_priv *priv = ieee80211_priv(dev);

cmd = read_nic_byte(dev, CMD);
- write_nic_byte(dev, CMD, cmd & ~\
- ((1<<CMD_RX_ENABLE_SHIFT)|(1<<CMD_TX_ENABLE_SHIFT)));
+ write_nic_byte(dev, CMD, cmd &
+ ~((1<<CMD_RX_ENABLE_SHIFT)|(1<<CMD_TX_ENABLE_SHIFT)));
force_pci_posting(dev);
mdelay(10);

@@ -1258,8 +1258,7 @@ void rtl8180_rx(struct net_device *dev)

pci_dma_sync_single_for_cpu(priv->pdev,
priv->rxbuffer->dma,
- priv->rxbuffersize * \
- sizeof(u8),
+ priv->rxbuffersize * sizeof(u8),
PCI_DMA_FROMDEVICE);

first = *(priv->rxringtail) & (1<<29) ? 1 : 0;
@@ -1490,8 +1489,7 @@ void rtl8180_rx(struct net_device *dev)

pci_dma_sync_single_for_device(priv->pdev,
priv->rxbuffer->dma,
- priv->rxbuffersize * \
- sizeof(u8),
+ priv->rxbuffersize * sizeof(u8),
PCI_DMA_FROMDEVICE);

drop: /* this is used when we have not enough mem */
--
1.7.9.5

2012-11-22 19:30:41

by YAMANE Toshiaki

[permalink] [raw]
Subject: [PATCH 3/4] staging/rtl8187se: Fix spacing coding style in r8180_core.c

The following errors fixed.
-ERROR: "foo * bar" should be "foo *bar"
-ERROR: "(foo*)" should be "(foo *)"

Signed-off-by: YAMANE Toshiaki <[email protected]>
---
drivers/staging/rtl8187se/r8180_core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 8c8b09d..3119fe6 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -1699,7 +1699,7 @@ void rtl8180_prepare_beacon(struct net_device *dev)
* descriptor in the ring buffer, copyes the frame in a TX buffer
* and kicks the NIC to ensure it does the DMA transfer.
*/
-short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority,
+short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority,
short morefrag, short descfrag, int rate)
{
struct r8180_priv *priv = ieee80211_priv(dev);
@@ -2211,7 +2211,7 @@ void rtl8180_watch_dog(struct net_device *dev);

void watch_dog_adaptive(unsigned long data)
{
- struct r8180_priv* priv = ieee80211_priv((struct net_device *)data);
+ struct r8180_priv *priv = ieee80211_priv((struct net_device *)data);

if (!priv->up) {
DMESG("<----watch_dog_adaptive():driver is not up!\n");
@@ -3462,7 +3462,7 @@ void rtl8180_tx_isr(struct net_device *dev, int pri, short error)
return ;
}

- nicv = (u32 *)((nic - nicbegin) + (u8*)begin);
+ nicv = (u32 *)((nic - nicbegin) + (u8 *)begin);
if ((head <= tail && (nicv > tail || nicv < head)) ||
(head > tail && (nicv > tail && nicv < head))) {
DMESGW("nic has lost pointer");
--
1.7.9.5