Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1601200

[PATCH v3 2/8] staging: rtl8192e: Fix coding style

From sunil.m@techveda.org
Newsgroups linux.kernel
Subject [PATCH v3 2/8] staging: rtl8192e: Fix coding style
Date 2017-03-15 11:00 +0100
Message-ID <tldSO-5Pm-15@gated-at.bofh.it> (permalink)
References <tkc2K-2cL-21@gated-at.bofh.it> <tldSN-5Pm-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Suniel Mahesh <sunil.m@techveda.org>

Fixed the following checkpatch.pl warning:
line over 80 characters

Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
---
Changes for v3:

- Split earlier patches into multiple commits for easy review
  as suggested by Greg K-H
- New patch addition to the series
- Rebased on top of next-20170310
- Patches were tested and built on next-20170310 and staging-testing
  as suggested by Greg K-H, no errors reported

Changes for v2:
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 30 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index a648064..eb2321c 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -218,7 +218,7 @@ bool rtl92e_set_rf_state(struct net_device *dev,
 				else
 					priv->blinked_ingpio = false;
 				rtllib_MgntDisconnect(priv->rtllib,
-						      WLAN_REASON_DISASSOC_STA_HAS_LEFT);
+					WLAN_REASON_DISASSOC_STA_HAS_LEFT);
 			}
 		}
 		if ((ChangeSource == RF_CHANGE_BY_HW) && !priv->bHwRadioOff)
@@ -1796,7 +1796,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
 
 	for (rx_queue_idx = 0; rx_queue_idx < MAX_RX_QUEUE; rx_queue_idx++) {
 		priv->rx_ring[rx_queue_idx] = pci_zalloc_consistent(priv->pdev,
-					      sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount,
+		sizeof(*priv->rx_ring[rx_queue_idx]) * priv->rxringcount,
 					      &priv->rx_ring_dma[rx_queue_idx]);
 		if (!priv->rx_ring[rx_queue_idx] ||
 		    (unsigned long)priv->rx_ring[rx_queue_idx] & 0xFF) {
@@ -2272,7 +2272,8 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 	int ret = -1;
 	struct rtllib_device *ieee = priv->rtllib;
 	u32 key[4];
-	const u8 broadcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+	const u8 broadcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff,
+									0xff};
 	struct iw_point *p = &wrq->u.data;
 	struct ieee_param *ipw = NULL;
 
@@ -2309,14 +2310,15 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 				}
 
 				if (ieee->pairwise_key_type) {
-					if (is_zero_ether_addr(ieee->ap_mac_addr))
+					if (is_zero_ether_addr(
+							ieee->ap_mac_addr))
 						ieee->iw_mode = IW_MODE_ADHOC;
 					memcpy((u8 *)key, ipw->u.crypt.key, 16);
 					rtl92e_enable_hw_security_config(dev);
 					rtl92e_set_swcam(dev, 4,
 							 ipw->u.crypt.idx,
-							 ieee->pairwise_key_type,
-							 (u8 *)ieee->ap_mac_addr,
+							ieee->pairwise_key_type,
+							(u8 *)ieee->ap_mac_addr,
 							 0, key, 0);
 					rtl92e_set_key(dev, 4, ipw->u.crypt.idx,
 						       ieee->pairwise_key_type,
@@ -2324,17 +2326,17 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 						       0, key);
 					if (ieee->iw_mode == IW_MODE_ADHOC) {
 						rtl92e_set_swcam(dev,
-								 ipw->u.crypt.idx,
-								 ipw->u.crypt.idx,
-								 ieee->pairwise_key_type,
-								 (u8 *)ieee->ap_mac_addr,
-								 0, key, 0);
+							ipw->u.crypt.idx,
+							ipw->u.crypt.idx,
+							ieee->pairwise_key_type,
+							(u8 *)ieee->ap_mac_addr,
+								0, key, 0);
 						rtl92e_set_key(dev,
 							       ipw->u.crypt.idx,
 							       ipw->u.crypt.idx,
-							       ieee->pairwise_key_type,
-							       (u8 *)ieee->ap_mac_addr,
-							       0, key);
+							ieee->pairwise_key_type,
+							(u8 *)ieee->ap_mac_addr,
+									0, key);
 					}
 				}
 				if ((ieee->pairwise_key_type == KEY_TYPE_CCMP)
-- 
1.9.1

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v3 0/8] staging: rtl8192e: Fix coding style, warnings and checks sunil.m@techveda.org - 2017-03-15 11:00 +0100
  [PATCH v3 8/8] staging: rtl8192e: Fix blank lines and space after a cast sunil.m@techveda.org - 2017-03-15 11:00 +0100
  [PATCH v3 2/8] staging: rtl8192e: Fix coding style sunil.m@techveda.org - 2017-03-15 11:00 +0100
    Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:20 +0100
    Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:20 +0100
      Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Suniel Mahesh <sunil.m@techveda.org> - 2017-03-15 12:20 +0100
        Re: [PATCH v3 2/8] staging: rtl8192e: Fix coding style Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 12:20 +0100
  [PATCH v3 6/8] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m@techveda.org - 2017-03-15 11:00 +0100
  [PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces sunil.m@techveda.org - 2017-03-15 11:00 +0100
    Re: [PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:30 +0100
  [PATCH v3 1/8] staging: rtl8192e: Fix comments as per kernel coding style sunil.m@techveda.org - 2017-03-15 11:00 +0100
  [PATCH v3 7/8] staging: rtl8192e: Fix issues reported by checkpatch.pl sunil.m@techveda.org - 2017-03-15 11:00 +0100
  [PATCH v3 4/8] staging: rtl8192e: Rectify pointer comparisions with NULL sunil.m@techveda.org - 2017-03-15 11:00 +0100
  [PATCH v3 3/8] staging: rtl8192e: Remove unnecessary 'out of memory' message sunil.m@techveda.org - 2017-03-15 11:00 +0100
    Re: [PATCH v3 3/8] staging: rtl8192e: Remove unnecessary 'out of  memory' message Dan Carpenter <dan.carpenter@oracle.com> - 2017-03-15 11:20 +0100
      [PATCH v4 3/8] staging: rtl8192e: Remove unnecessary 'out of memory' message sunil.m@techveda.org - 2017-03-15 12:00 +0100
        Re: [PATCH v4 3/8] staging: rtl8192e: Remove unnecessary 'out of  memory' message Greg KH <gregkh@linuxfoundation.org> - 2017-03-16 03:40 +0100
          [PATCH v4 4/6] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct sunil.m@techveda.org - 2017-03-16 23:30 +0100
          [PATCH v4 0/6] staging: rtl8192e: Fix coding style, warnings and checks sunil.m@techveda.org - 2017-03-16 23:30 +0100
            [PATCH v4 6/6] staging: rtl8192e: Fix blank lines and space after a cast sunil.m@techveda.org - 2017-03-16 23:30 +0100
            Re: [PATCH v4 0/6] staging: rtl8192e: Fix coding style, warnings and  checks Greg KH <gregkh@linuxfoundation.org> - 2017-03-17 07:20 +0100
              [PATCH v5 2/6] staging: rtl8192e: Remove unnecessary 'out of memory' message suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
              [PATCH v5 4/6] staging: rtl8192e: Pass a pointer as an argument to sizeof() instead of struct suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
              [PATCH v5 0/6] staging: rtl8192e: Fix coding style, warnings and checks suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
                [PATCH v5 6/6] staging: rtl8192e: Fix blank lines and space after a cast suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
                [PATCH v5 3/6] staging: rtl8192e: Rectify pointer comparisions with NULL suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
                [PATCH v5 1/6] staging: rtl8192e: Fix comments as per kernel coding style suniel.spartan@gmail.com - 2017-03-21 10:10 +0100
                [PATCH v5 5/6] staging: rtl8192e: Fix issues reported by checkpatch.pl suniel.spartan@gmail.com - 2017-03-21 10:10 +0100

csiph-web