[PATCH v2 16/16] staging: wlags49_h2: Fix lines over 80 characters

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Where possible, fix lines that exceed 80 characters in wl_netdev.c
WARNING: line over 80 characters

Signed-off-by: Jelena Bjelja <jelena.bjelja.ing@xxxxxxxxx>
---
 drivers/staging/wlags49_h2/wl_netdev.c |   62 +++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c
index 8345833..12fdf60 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@ -206,8 +206,9 @@ int wl_config(struct net_device *dev, struct ifmap *map)
 	DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
 	DBG_PARAM(DbgInfo, "map", "0x%p", map);
 
-	/* The only thing we care about here is a port change. Since this not needed,
-	ignore the request. */
+	/* The only thing we care about here is a port change.
+	 * Since this is not needed, ignore the request.
+	 */
 	DBG_TRACE(DbgInfo, "%s: %s called.\n", dev->name, __func__);
 
 	return 0;
@@ -319,7 +320,8 @@ int wl_open(struct net_device *dev)
 		status = wl_enable(lp);
 
 		if (status != HCF_SUCCESS)
-			DBG_TRACE(DbgInfo, "Enable port 0 failed: 0x%x\n", status);
+			DBG_TRACE(DbgInfo, "Enable port 0 failed: 0x%x\n",
+					status);
 	}
 
 	/* Holding the lock too long, make a gap to allow other processes */
@@ -350,14 +352,15 @@ 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 */
+		/* Start handling interrupts */
+		lp->is_handling_int = WL_HANDLING_INT;
 		wl_act_int_on(lp);
 
 		netif_start_queue(dev);
 		WL_WDS_NETIF_START_QUEUE(lp);
 	} else {
-		wl_hcf_error(dev, status);		/* Report the error */
-		netif_device_detach(dev);		/* Stop the device and queue */
+		wl_hcf_error(dev, status);	/* Report the error */
+		netif_device_detach(dev);	/* Stop the device and queue */
 	}
 
 	wl_unlock(lp, &flags);
@@ -409,7 +412,8 @@ 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 */
+	/* Stop handling interrupts */
+	lp->is_handling_int = WL_NOT_HANDLING_INT;
 
 #ifdef USE_RTS
 	if (lp->useRTS == 1) {
@@ -494,7 +498,8 @@ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 			DBG_TRACE(DbgInfo, "IOCTL: WL_IOCTL_RTS\n");
 			ret = wvlan_rts((struct rtsreq *)rq, dev->base_addr);
 		} else {
-			DBG_TRACE(DbgInfo, "IOCTL not supported in RTS mode: 0x%X\n", cmd);
+			DBG_TRACE(DbgInfo,
+				"IOCTL not supported in RTS mode: 0x%X\n", cmd);
 			ret = -EOPNOTSUPP;
 		}
 
@@ -502,7 +507,7 @@ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 	}
 #endif  /* USE_RTS */
 
-	/* Only handle UIL IOCTL requests when the UIL has the system blocked. */
+	/* Only handle UIL IOCTL requests when the UIL has the system blocked */
 	if (!((lp->flags & WVLAN2_UIL_BUSY) && (cmd != WVLAN2_IOCTL_UIL))) {
 #ifdef USE_UIL
 		struct uilreq  *urq = (struct uilreq *)rq;
@@ -518,12 +523,14 @@ int wl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 #endif  /* USE_UIL */
 
 		default:
-			DBG_TRACE(DbgInfo, "IOCTL CODE NOT SUPPORTED: 0x%X\n", cmd);
+			DBG_TRACE(DbgInfo,
+				"IOCTL CODE NOT SUPPORTED: 0x%X\n", cmd);
 			ret = -EOPNOTSUPP;
 			break;
 		}
 	} else {
-		DBG_WARNING(DbgInfo, "DEVICE IS BUSY, CANNOT PROCESS REQUEST\n");
+		DBG_WARNING(DbgInfo,
+			"DEVICE IS BUSY, CANNOT PROCESS REQUEST\n");
 		ret = -EBUSY;
 	}
 
@@ -584,7 +591,8 @@ void wl_tx_timeout(struct net_device *dev)
 
 #ifdef USE_RTS
 	if (lp->useRTS == 1) {
-		DBG_TRACE(DbgInfo, "Skipping tx_timeout handler, in RTS mode\n");
+		DBG_TRACE(DbgInfo,
+			"Skipping tx_timeout handler, in RTS mode\n");
 		wl_unlock(lp, &flags);
 		return;
 	}
@@ -646,7 +654,7 @@ int wl_send(struct wl_private *lp)
 	WVLAN_LFRAME        *txF = NULL;
 	struct list_head    *element;
 	int                 len;
-	/*------------------------------------------------------------------------*/
+	/*-------------------------------------------------------------------*/
 
 	if (lp == NULL) {
 		DBG_ERROR(DbgInfo, "Private adapter struct is NULL\n");
@@ -682,7 +690,9 @@ int wl_send(struct wl_private *lp)
 
 			if (lp->txQ_count < TX_Q_LOW_WATER_MARK) {
 				if (lp->netif_queue_on == FALSE) {
-					DBG_TX(DbgInfo, "Kickstarting Q: %d\n", lp->txQ_count);
+					DBG_TX(DbgInfo,
+						"Kickstarting Q: %d\n",
+						lp->txQ_count);
 					netif_wake_queue(lp->dev);
 					WL_WDS_NETIF_WAKE_QUEUE(lp);
 					lp->netif_queue_on = TRUE;
@@ -746,7 +756,7 @@ int wl_send(struct wl_private *lp)
  *
  *  PARAMETERS:
  *
- *      skb - a pointer to the sk_buff structure containing the data to transfer.
+ *      skb - a pointer to the sk_buff structure containing the data to transfer
  *      dev - a pointer to the device's net_device structure.
  *
  *  RETURNS:
@@ -762,7 +772,7 @@ int wl_tx(struct sk_buff *skb, struct net_device *dev, int port)
 	struct wl_private       *lp = wl_priv(dev);
 	WVLAN_LFRAME            *txF = NULL;
 	struct list_head        *element;
-	/*------------------------------------------------------------------------*/
+	/*--------------------------------------------------------------------*/
 
 	/* Grab the spinlock */
 	wl_lock(lp, &flags);
@@ -854,7 +864,7 @@ int wl_rx(struct net_device *dev)
 	hcf_16                  pktlen;
 	hcf_16                  hfs_stat;
 	DESC_STRCT              *desc;
-	/*------------------------------------------------------------------------*/
+	/*--------------------------------------------------------------------*/
 
 	DBG_PARAM(DbgInfo, "dev", "%s (0x%p)", dev->name, dev);
 
@@ -1088,8 +1098,8 @@ void wl_multicast(struct net_device *dev)
 				 * device; however, this is a static RID,
 				 * so a call to wl_apply() is needed
 				 */
-				lp->ltvRecord.len       = 2;
-				lp->ltvRecord.typ       = CFG_CNF_RX_ALL_GROUP_ADDR;
+				lp->ltvRecord.len = 2;
+				lp->ltvRecord.typ = CFG_CNF_RX_ALL_GROUP_ADDR;
 				lp->ltvRecord.u.u16[0]  = CNV_INT_TO_LITTLE(1);
 				DBG_PRINT("Disabling all multicast mode (IFF_ALLMULTI)\n");
 				hcf_put_info(&(lp->hcfCtx), (LTVP)&(lp->ltvRecord));
@@ -1784,8 +1794,10 @@ int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port)
 
 	hcf_dma_tx_put(&(lp->hcfCtx), desc, 0);
 
-	/* Free the skb and perform queue cleanup, as the buffer was
-	transmitted successfully */
+	/* Free the skb and perform queue cleanup,
+	 * as the buffer was
+	 * transmitted successfully
+	 */
 	dev_kfree_skb(skb);
 
 	return TRUE;
@@ -1880,8 +1892,9 @@ int wl_rx_dma(struct net_device *dev)
 
 			/* Make sure the frame isn't bad */
 			if ((hfs_stat & HFS_STAT_ERR) != HCF_SUCCESS) {
-				DBG_WARNING(DbgInfo, "HFS_STAT_ERROR (0x%x) in Rx Packet\n",
-				desc->buf_addr[HFS_STAT/2]);
+				DBG_WARNING(DbgInfo,
+					"HFS_STAT_ERROR (0x%x) in Rx Packet\n",
+					desc->buf_addr[HFS_STAT/2]);
 
 				/* Give the descriptor back to the HCF */
 				hcf_dma_rx_put(&(lp->hcfCtx), desc);
@@ -1935,7 +1948,8 @@ int wl_rx_dma(struct net_device *dev)
 					dev->last_rx = jiffies;
 
 				} else {
-					DBG_ERROR(DbgInfo, "Could not alloc skb\n");
+					DBG_ERROR(DbgInfo,
+						"Could not alloc skb\n");
 
 					if (port == 0)
 						lp->stats.rx_dropped++;
-- 
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




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux