aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/otus/usbdrv.c
diff options
context:
space:
mode:
authorMithlesh Thukral <mithlesh@linsyssoft.com>2009-10-26 21:22:55 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:11 -0800
commit2bef7a0fc85e420c55820c0fabfe264d38228588 (patch)
tree9ac72de7f0cd4e30f639ff89aaad94435322c3f4 /drivers/staging/otus/usbdrv.c
parentb767fa1d110230f342243034e285ceadcbbb709e (diff)
Staging: otus : checkpatch.pl cleanup for some more .c files
Second lot of checkpatch.pl error and warning fixes for .c files of otus driver in staging tree. (Externs would be removed in a seperate patch) Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/usbdrv.c')
-rw-r--r--drivers/staging/otus/usbdrv.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/staging/otus/usbdrv.c b/drivers/staging/otus/usbdrv.c
index 48aa30a6216..b0adbc8b2dc 100644
--- a/drivers/staging/otus/usbdrv.c
+++ b/drivers/staging/otus/usbdrv.c
@@ -111,7 +111,7 @@ extern u8_t zfLnxCreateThread(zdev_t *dev);
/* Definition of Wireless Extension */
-//wireless extension helper functions
+/* wireless extension helper functions */
extern int usbdrv_ioctl_setessid(struct net_device *dev, struct iw_point *erq);
extern int usbdrv_ioctl_setrts(struct net_device *dev, struct iw_param *rrq);
/* Wireless Extension Handler functions */
@@ -282,8 +282,8 @@ static struct iw_handler_def p80211wext_handler_def = {
};
/* WDS */
-//struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER];
-//void zfInitWdsStruct(void);
+/* struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; */
+/* void zfInitWdsStruct(void); */
/* VAP */
struct zsVapStruct vap[ZM_VAP_PORT_NUMBER];
@@ -314,13 +314,11 @@ irqreturn_t usbdrv_intr(int irq, void *dev_inst, struct pt_regs *regs)
return IRQ_NONE;
/* the device is closed, don't continue or else bad things may happen. */
- if (!netif_running(dev)) {
+ if (!netif_running(dev))
return IRQ_NONE;
- }
- if (macp->driver_isolated) {
+ if (macp->driver_isolated)
return IRQ_NONE;
- }
#if (WLAN_HOSTIF == WLAN_PCI)
//zfiIsrPci(dev);
@@ -340,9 +338,11 @@ int usbdrv_open(struct net_device *dev)
printk("Enter open()\n");
-//#ifndef CONFIG_SMP
-// read_lock(&(macp->isolate_lock));
-//#endif
+/*
+ * #ifndef CONFIG_SMP
+ * read_lock(&(macp->isolate_lock));
+ * #endif
+ */
if (macp->driver_isolated) {
rc = -EBUSY;
goto exit;
@@ -393,11 +393,11 @@ int usbdrv_open(struct net_device *dev)
dev->dev_addr[4] = addr[4];
dev->dev_addr[5] = addr[5];
#endif
- //zfwMacAddressNotify() will be called to setup dev->dev_addr[]
+ /* zfwMacAddressNotify() will be called to setup dev->dev_addr[] */
zfLnxCreateThread(dev);
- mod_timer(&(macp->hbTimer10ms), jiffies + (1*HZ)/100); //10 ms
+ mod_timer(&(macp->hbTimer10ms), jiffies + (1*HZ)/100); /* 10 ms */
netif_carrier_on(dev);
@@ -425,15 +425,15 @@ int usbdrv_open(struct net_device *dev)
#if ZM_SHARE_AUTH == 1
zfiWlanSetAuthenticationMode(dev, 1);
- #endif //#if ZM_SHARE_AUTH == 1
- #endif //#if ZM_WEP_MOME == 1
+ #endif /* #if ZM_SHARE_AUTH == 1 */
+ #endif /* #if ZM_WEP_MOME == 1 */
#elif ZM_PIBSS_MODE == 1
zfiWlanSetWlanMode(dev, ZM_MODE_PSEUDO);
#else
zfiWlanSetWlanMode(dev, ZM_MODE_INFRASTRUCTURE);
#endif
- //zfiWlanSetChannel(dev, ZM_CHANNEL, FALSE);
+ /* zfiWlanSetChannel(dev, ZM_CHANNEL, FALSE); */
zfiWlanSetFrequency(dev, 2462000, FALSE);
zfiWlanSetRtsThreshold(dev, 32767);
zfiWlanSetFragThreshold(dev, 0);
@@ -720,7 +720,7 @@ void zfLnxInitVapStruct(void)
{
u16_t i;
- for (i=0; i<ZM_VAP_PORT_NUMBER; i++)
+ for (i = 0; i < ZM_VAP_PORT_NUMBER; i++)
{
vap[i].dev = NULL;
vap[i].openFlag = 0;
@@ -1128,8 +1128,7 @@ u8_t zfLnxClearStructs(struct net_device *dev)
printk(KERN_ERR "TxQCnt: %d\n", TxQCnt);
- for(ii = 0; ii < TxQCnt; ii++)
- {
+ for (ii = 0; ii < TxQCnt; ii++) {
UsbTxQ_t *TxQ = zfLnxGetUsbTxBuffer(dev);
printk(KERN_ERR "dev_kfree_skb_any\n");