This patch fixes the following checkpatch.pl issues in wl_netdev.c:
ERROR: do not use C99 // comments
Signed-off-by: Jelena Bjelja <jelena.bjelja.ing@xxxxxxxxx>
---
drivers/staging/wlags49_h2/wl_netdev.c | 150 ++++++++++++++++----------------
1 file changed, 75 insertions(+), 75 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c
index 6ab0ff3..6d924c5 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@ -68,31 +68,31 @@
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/kernel.h>
-// #include <linux/sched.h>
-// #include <linux/ptrace.h>
-// #include <linux/slab.h>
-// #include <linux/ctype.h>
-// #include <linux/string.h>
-//#include <linux/timer.h>
-// #include <linux/interrupt.h>
-// #include <linux/in.h>
-// #include <linux/delay.h>
-// #include <linux/skbuff.h>
-// #include <asm/io.h>
-// // #include <asm/bitops.h>
+/* #include <linux/sched.h> */
+/* #include <linux/ptrace.h> */
+/* #include <linux/slab.h> */
+/* #include <linux/ctype.h> */
+/* #include <linux/string.h> */
+/* #include <linux/timer.h> */
+/* #include <linux/interrupt.h> */
+/* #include <linux/in.h> */
+/* #include <linux/delay.h> */
+/* #include <linux/skbuff.h> */
+/* #include <asm/io.h> */
+/* #include <asm/bitops.h> */
#include <linux/netdevice.h>
#include <linux/ethtool.h>
#include <linux/etherdevice.h>
-// #include <linux/skbuff.h>
-// #include <linux/if_arp.h>
-// #include <linux/ioport.h>
+/* #include <linux/skbuff.h> */
+/* #include <linux/if_arp.h> */
+/* #include <linux/ioport.h> */
#include <debug.h>
#include <hcf.h>
#include <dhf.h>
-// #include <hcfdef.h>
+/* #include <hcfdef.h> */
#include <wl_if.h>
#include <wl_internal.h>
@@ -121,9 +121,9 @@
#define MTU_MAX (HCF_MAX_MSG - ETH_HLEN)
#endif
-//static int mtu = MTU_MAX;
-//MODULE_PARM(mtu, "i");
-//MODULE_PARM_DESC(mtu, "MTU");
+/* static int mtu = MTU_MAX; */
+/* MODULE_PARM(mtu, "i"); */
+/* MODULE_PARM_DESC(mtu, "MTU"); */
/*******************************************************************************
* macros
@@ -160,18 +160,18 @@
******************************************************************************/
int wl_init(struct net_device *dev)
{
-// unsigned long flags;
-// struct wl_private *lp = wl_priv(dev);
+/* unsigned long flags; */
+/* struct wl_private *lp = wl_priv(dev); */
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
/* Nothing to do, but grab the spinlock anyway just in case we ever need
this routine */
-// wl_lock(lp, &flags);
-// wl_unlock(lp, &flags);
+/* wl_lock( lp, &flags ); */
+/* wl_unlock( lp, &flags ); */
return 0;
-} // wl_init
+} /* wl_init */
/*============================================================================*/
/*******************************************************************************
@@ -203,7 +203,7 @@ int wl_config(struct net_device *dev, struct ifmap *map)
DBG_TRACE(DbgInfo, "%s: %s called.\n", dev->name, __func__);
return 0;
-} // wl_config
+} /* wl_config */
/*============================================================================*/
/*******************************************************************************
@@ -233,7 +233,7 @@ struct net_device_stats *wl_stats(struct net_device *dev)
struct net_device_stats *pStats;
struct wl_private *lp = wl_priv(dev);
- //DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
+ /* DBG_PARAM( DbgInfo, "dev", "%s (0x%p)", dev->name, dev ); */
pStats = NULL;
@@ -265,7 +265,7 @@ struct net_device_stats *wl_stats(struct net_device *dev)
wl_unlock(lp, &flags);
return pStats;
-} // wl_stats
+} /* wl_stats */
/*============================================================================*/
/*******************************************************************************
@@ -315,7 +315,7 @@ int wl_open(struct net_device *dev)
}
}
- // Holding the lock too long, make a gap to allow other processes
+ /* Holding the lock too long, make a gap to allow other processes */
wl_unlock(lp, &flags);
wl_lock(lp, &flags);
@@ -326,16 +326,16 @@ int wl_open(struct net_device *dev)
status = wl_apply(lp);
}
- // Holding the lock too long, make a gap to allow other processes
+ /* Holding the lock too long, make a gap to allow other processes */
wl_unlock(lp, &flags);
wl_lock(lp, &flags);
if (status != HCF_SUCCESS) {
- // Unsuccessful, try reset of the card to recover
+ /* Unsuccessful, try reset of the card to recover */
status = wl_reset(dev);
}
- // Holding the lock too long, make a gap to allow other processes
+ /* Holding the lock too long, make a gap to allow other processes */
wl_unlock(lp, &flags);
wl_lock(lp, &flags);
@@ -343,7 +343,7 @@ int wl_open(struct net_device *dev)
netif_carrier_on(dev);
WL_WDS_NETIF_CARRIER_ON(lp);
- lp->is_handling_int = WL_HANDLING_INT; // Start handling interrupts
+ lp->is_handling_int = WL_HANDLING_INT; /* Start handling interrupts */
wl_act_int_on(lp);
netif_start_queue(dev);
@@ -356,7 +356,7 @@ int wl_open(struct net_device *dev)
wl_unlock(lp, &flags);
return status;
-} // wl_open
+} /* wl_open */
/*============================================================================*/
/*******************************************************************************
@@ -401,7 +401,7 @@ int wl_close(struct net_device *dev)
wl_lock(lp, &flags);
wl_act_int_off(lp);
- lp->is_handling_int = WL_NOT_HANDLING_INT; // Stop handling interrupts
+ lp->is_handling_int = WL_NOT_HANDLING_INT; /* Stop handling interrupts */
#ifdef USE_RTS
if (lp->useRTS == 1) {
@@ -417,26 +417,26 @@ int wl_close(struct net_device *dev)
wl_unlock(lp, &flags);
return 0;
-} // wl_close
+} /* wl_close */
/*============================================================================*/
static void wl_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{
strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
strlcpy(info->version, DRV_VERSION_STR, sizeof(info->version));
-// strlcpy(info.fw_version, priv->fw_name,
-// sizeof(info.fw_version));
+/* strlcpy(info.fw_version, priv->fw_name, */
+/* sizeof(info.fw_version)); */
if (dev->dev.parent) {
dev_set_name(dev->dev.parent, "%s", info->bus_info);
- //strlcpy(info->bus_info, dev->dev.parent->bus_id,
- // sizeof(info->bus_info));
+ /* strlcpy(info->bus_info, dev->dev.parent->bus_id, */
+ /* sizeof(info->bus_info)); */
} else {
snprintf(info->bus_info, sizeof(info->bus_info),
"PCMCIA FIXME");
-// "PCMCIA 0x%lx", priv->hw.iobase);
+/* "PCMCIA 0x%lx", priv->hw.iobase); */
}
-} // wl_get_drvinfo
+} /* wl_get_drvinfo */
static struct ethtool_ops wl_ethtool_ops = {
.get_drvinfo = wl_get_drvinfo,
@@ -500,7 +500,7 @@ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
#endif /* USE_UIL */
switch (cmd) {
- // ================== Private IOCTLs (up to 16) ==================
+ /* ================== Private IOCTLs (up to 16) ================== */
#ifdef USE_UIL
case WVLAN2_IOCTL_UIL:
DBG_TRACE(DbgInfo, "IOCTL: WVLAN2_IOCTL_UIL\n");
@@ -526,7 +526,7 @@ out_act_int_on_unlock:
wl_unlock(lp, &flags);
return ret;
-} // wl_ioctl
+} /* wl_ioctl */
/*============================================================================*/
#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -605,7 +605,7 @@ void wl_tx_timeout(struct net_device *dev)
pStats->tx_errors++;
wl_unlock(lp, &flags);
-} // wl_tx_timeout
+} /* wl_tx_timeout */
/*============================================================================*/
/*******************************************************************************
@@ -722,7 +722,7 @@ int wl_send(struct wl_private *lp)
}
return TRUE;
-} // wl_send
+} /* wl_send */
/*============================================================================*/
/*******************************************************************************
@@ -812,7 +812,7 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port)
wl_act_int_on(lp);
wl_unlock(lp, &flags);
return 0;
-} // wl_tx
+} /* wl_tx */
/*============================================================================*/
/*******************************************************************************
@@ -964,7 +964,7 @@ int wl_rx(struct net_device *dev)
}
return 0;
-} // wl_rx
+} /* wl_rx */
/*============================================================================*/
/*******************************************************************************
@@ -988,8 +988,8 @@ int wl_rx(struct net_device *dev)
void wl_multicast(struct net_device *dev)
{
-#if 1 //;? (HCF_TYPE) & HCF_TYPE_STA //;?should we return an error status in AP mode
-//;?seems reasonable that even an AP-only driver could afford this small additional footprint
+#if 1 /*;? (HCF_TYPE) & HCF_TYPE_STA ;?should we return an error status in AP mode */
+/* ;?seems reasonable that even an AP-only driver could afford this small additional footprint */
int x;
struct netdev_hw_addr *ha;
@@ -1088,7 +1088,7 @@ void wl_multicast(struct net_device *dev)
wl_unlock(lp, &flags);
}
#endif /* HCF_STA */
-} // wl_multicast
+} /* wl_multicast */
/*============================================================================*/
#else /* NEW_MULTICAST */
@@ -1100,7 +1100,7 @@ void wl_multicast(struct net_device *dev, int num_addrs, void *addrs)
DBG_PARAM(DbgInfo, "addrs", "0x%p", addrs);
#error Obsolete set multicast interface!
-} // wl_multicast
+} /* wl_multicast */
/*============================================================================*/
#endif /* NEW_MULTICAST */
@@ -1185,7 +1185,7 @@ struct net_device * wl_device_alloc(void)
WL_WDS_DEVICE_ALLOC(lp);
return dev;
-} // wl_device_alloc
+} /* wl_device_alloc */
/*============================================================================*/
/*******************************************************************************
@@ -1208,13 +1208,13 @@ struct net_device * wl_device_alloc(void)
******************************************************************************/
void wl_device_dealloc(struct net_device *dev)
{
-// struct wl_private *lp = wl_priv(dev);
+/* struct wl_private *lp = wl_priv(dev); */
/* Dealloc the WDS ports */
WL_WDS_DEVICE_DEALLOC(lp);
free_netdev(dev);
-} // wl_device_dealloc
+} /* wl_device_dealloc */
/*============================================================================*/
/*******************************************************************************
@@ -1243,7 +1243,7 @@ int wl_tx_port0(struct sk_buff *skb, struct net_device *dev)
#ifdef ENABLE_DMA
return wl_tx_dma(skb, dev, HCF_PORT_0);
#endif
-} // wl_tx_port0
+} /* wl_tx_port0 */
/*============================================================================*/
#ifdef USE_WDS
@@ -1270,7 +1270,7 @@ int wl_tx_port1(struct sk_buff *skb, struct net_device *dev)
{
DBG_TX(DbgInfo, "Tx on Port 1\n");
return wl_tx(skb, dev, HCF_PORT_1);
-} // wl_tx_port1
+} /* wl_tx_port1 */
/*============================================================================*/
/*******************************************************************************
@@ -1295,7 +1295,7 @@ int wl_tx_port2(struct sk_buff *skb, struct net_device *dev)
{
DBG_TX(DbgInfo, "Tx on Port 2\n");
return wl_tx(skb, dev, HCF_PORT_2);
-} // wl_tx_port2
+} /* wl_tx_port2 */
/*============================================================================*/
/*******************************************************************************
@@ -1320,7 +1320,7 @@ int wl_tx_port3(struct sk_buff *skb, struct net_device *dev)
{
DBG_TX(DbgInfo, "Tx on Port 3\n");
return wl_tx(skb, dev, HCF_PORT_3);
-} // wl_tx_port3
+} /* wl_tx_port3 */
/*============================================================================*/
/*******************************************************************************
@@ -1345,7 +1345,7 @@ int wl_tx_port4(struct sk_buff *skb, struct net_device *dev)
{
DBG_TX(DbgInfo, "Tx on Port 4\n");
return wl_tx(skb, dev, HCF_PORT_4);
-} // wl_tx_port4
+} /* wl_tx_port4 */
/*============================================================================*/
/*******************************************************************************
@@ -1370,7 +1370,7 @@ int wl_tx_port5(struct sk_buff *skb, struct net_device *dev)
{
DBG_TX(DbgInfo, "Tx on Port 5\n");
return wl_tx(skb, dev, HCF_PORT_5);
-} // wl_tx_port5
+} /* wl_tx_port5 */
/*============================================================================*/
/*******************************************************************************
@@ -1395,7 +1395,7 @@ int wl_tx_port6(struct sk_buff *skb, struct net_device *dev)
{
DBG_TX(DbgInfo, "Tx on Port 6\n");
return wl_tx(skb, dev, HCF_PORT_6);
-} // wl_tx_port6
+} /* wl_tx_port6 */
/*============================================================================*/
/*******************************************************************************
@@ -1460,7 +1460,7 @@ void wl_wds_device_alloc(struct wl_private *lp)
lp->wds_port[5].dev->hard_start_xmit = &wl_tx_port6;
WL_WDS_NETIF_STOP_QUEUE(lp);
-} // wl_wds_device_alloc
+} /* wl_wds_device_alloc */
/*============================================================================*/
/*******************************************************************************
@@ -1499,7 +1499,7 @@ void wl_wds_device_dealloc(struct wl_private *lp)
lp->wds_port[count].dev = NULL;
}
}
-} // wl_wds_device_dealloc
+} /* wl_wds_device_dealloc */
/*============================================================================*/
/*******************************************************************************
@@ -1534,7 +1534,7 @@ void wl_wds_netif_start_queue(struct wl_private *lp)
}
}
}
-} // wl_wds_netif_start_queue
+} /* wl_wds_netif_start_queue */
/*============================================================================*/
/*******************************************************************************
@@ -1569,7 +1569,7 @@ void wl_wds_netif_stop_queue(struct wl_private *lp)
}
}
}
-} // wl_wds_netif_stop_queue
+} /* wl_wds_netif_stop_queue */
/*============================================================================*/
/*******************************************************************************
@@ -1604,7 +1604,7 @@ void wl_wds_netif_wake_queue(struct wl_private *lp)
}
}
}
-} // wl_wds_netif_wake_queue
+} /* wl_wds_netif_wake_queue */
/*============================================================================*/
/*******************************************************************************
@@ -1637,7 +1637,7 @@ void wl_wds_netif_carrier_on(struct wl_private *lp)
}
}
}
-} // wl_wds_netif_carrier_on
+} /* wl_wds_netif_carrier_on */
/*============================================================================*/
/*******************************************************************************
@@ -1669,7 +1669,7 @@ void wl_wds_netif_carrier_off(struct wl_private *lp)
}
}
-} // wl_wds_netif_carrier_off
+} /* wl_wds_netif_carrier_off */
/*============================================================================*/
#endif /* USE_WDS */
@@ -1758,7 +1758,7 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port)
dev_kfree_skb(skb);
return TRUE;
-} // wl_send_dma
+} /* wl_send_dma */
/*============================================================================*/
/*******************************************************************************
@@ -1787,7 +1787,7 @@ int wl_rx_dma(struct net_device *dev)
struct sk_buff *skb;
struct wl_private *lp = NULL;
DESC_STRCT *desc, *desc_next;
- //CFG_MB_INFO_RANGE2_STRCT x;
+ /* CFG_MB_INFO_RANGE2_STRCT x; */
/*------------------------------------------------------------------------*/
DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
@@ -1802,8 +1802,8 @@ int wl_rx_dma(struct net_device *dev)
}
#endif /* USE_RTS */
- //if (lp->dma.status == 0)
- //{
+ /* if( lp->dma.status == 0 ) */
+ /* { */
desc = hcf_dma_rx_get(&(lp->hcfCtx));
if (desc != NULL)
@@ -1915,10 +1915,10 @@ int wl_rx_dma(struct net_device *dev)
}
}
}
- //}
+ /* } */
}
return 0;
-} // wl_rx_dma
+} /* wl_rx_dma */
/*============================================================================*/
-#endif // ENABLE_DMA
+#endif /* ENABLE_DMA */
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
