diff mbox series

[31/31] staging: wfx: indent functions arguments

Message ID 20210910160504.1794332-32-Jerome.Pouiller@silabs.com (mailing list archive)
State Not Applicable
Delegated to: Johannes Berg
Headers show
Series staging/wfx: usual maintenance | expand

Commit Message

Jérôme Pouiller Sept. 10, 2021, 4:05 p.m. UTC 
From: Jérôme Pouiller <jerome.pouiller@silabs.com>

Function arguments must be aligned with left parenthesis. Apply that
rule.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
 drivers/staging/wfx/hif_tx_mib.c |  2 +-
 drivers/staging/wfx/key.c        | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

Comments

Kari Argillander Sept. 10, 2021, 4:57 p.m. UTC | #1 
On Fri, Sep 10, 2021 at 06:05:04PM +0200, Jerome Pouiller wrote:
> From: Jérôme Pouiller <jerome.pouiller@silabs.com>
> 
> Function arguments must be aligned with left parenthesis. Apply that
> rule.

To my eyes something still go wrong with this patch. Might be my email
fault, but every other patch looks ok. Now these are too left. Also it
should alight with first argument not left parenthesis?

> 
> Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
> ---
>  drivers/staging/wfx/hif_tx_mib.c |  2 +-
>  drivers/staging/wfx/key.c        | 26 +++++++++++++-------------
>  2 files changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c
> index 45e531d996bd..97e961e6bcf6 100644
> --- a/drivers/staging/wfx/hif_tx_mib.c
> +++ b/drivers/staging/wfx/hif_tx_mib.c
> @@ -75,7 +75,7 @@ int hif_get_counters_table(struct wfx_dev *wdev, int vif_id,
>  	} else {
>  		return hif_read_mib(wdev, vif_id,
>  				    HIF_MIB_ID_EXTENDED_COUNTERS_TABLE, arg,
> -				sizeof(struct hif_mib_extended_count_table));
> +				    sizeof(struct hif_mib_extended_count_table));
>  	}
>  }
>  
> diff --git a/drivers/staging/wfx/key.c b/drivers/staging/wfx/key.c
> index 51a528102016..65134a174683 100644
> --- a/drivers/staging/wfx/key.c
> +++ b/drivers/staging/wfx/key.c
> @@ -31,7 +31,7 @@ static void wfx_free_key(struct wfx_dev *wdev, int idx)
>  }
>  
>  static u8 fill_wep_pair(struct hif_wep_pairwise_key *msg,
> -			     struct ieee80211_key_conf *key, u8 *peer_addr)
> +			struct ieee80211_key_conf *key, u8 *peer_addr)
>  {
>  	WARN(key->keylen > sizeof(msg->key_data), "inconsistent data");
>  	msg->key_length = key->keylen;
> @@ -41,7 +41,7 @@ static u8 fill_wep_pair(struct hif_wep_pairwise_key *msg,
>  }
>  
>  static u8 fill_wep_group(struct hif_wep_group_key *msg,
> -			      struct ieee80211_key_conf *key)
> +			 struct ieee80211_key_conf *key)
>  {
>  	WARN(key->keylen > sizeof(msg->key_data), "inconsistent data");
>  	msg->key_id = key->keyidx;
> @@ -51,7 +51,7 @@ static u8 fill_wep_group(struct hif_wep_group_key *msg,
>  }
>  
>  static u8 fill_tkip_pair(struct hif_tkip_pairwise_key *msg,
> -			      struct ieee80211_key_conf *key, u8 *peer_addr)
> +			 struct ieee80211_key_conf *key, u8 *peer_addr)
>  {
>  	u8 *keybuf = key->key;
>  
> @@ -68,9 +68,9 @@ static u8 fill_tkip_pair(struct hif_tkip_pairwise_key *msg,
>  }
>  
>  static u8 fill_tkip_group(struct hif_tkip_group_key *msg,
> -			       struct ieee80211_key_conf *key,
> -			       struct ieee80211_key_seq *seq,
> -			       enum nl80211_iftype iftype)
> +			  struct ieee80211_key_conf *key,
> +			  struct ieee80211_key_seq *seq,
> +			  enum nl80211_iftype iftype)
>  {
>  	u8 *keybuf = key->key;
>  
> @@ -93,7 +93,7 @@ static u8 fill_tkip_group(struct hif_tkip_group_key *msg,
>  }
>  
>  static u8 fill_ccmp_pair(struct hif_aes_pairwise_key *msg,
> -			      struct ieee80211_key_conf *key, u8 *peer_addr)
> +			 struct ieee80211_key_conf *key, u8 *peer_addr)
>  {
>  	WARN(key->keylen != sizeof(msg->aes_key_data), "inconsistent data");
>  	ether_addr_copy(msg->peer_address, peer_addr);
> @@ -102,8 +102,8 @@ static u8 fill_ccmp_pair(struct hif_aes_pairwise_key *msg,
>  }
>  
>  static u8 fill_ccmp_group(struct hif_aes_group_key *msg,
> -			       struct ieee80211_key_conf *key,
> -			       struct ieee80211_key_seq *seq)
> +			  struct ieee80211_key_conf *key,
> +			  struct ieee80211_key_seq *seq)
>  {
>  	WARN(key->keylen != sizeof(msg->aes_key_data), "inconsistent data");
>  	memcpy(msg->aes_key_data, key->key, key->keylen);
> @@ -114,7 +114,7 @@ static u8 fill_ccmp_group(struct hif_aes_group_key *msg,
>  }
>  
>  static u8 fill_sms4_pair(struct hif_wapi_pairwise_key *msg,
> -			      struct ieee80211_key_conf *key, u8 *peer_addr)
> +			 struct ieee80211_key_conf *key, u8 *peer_addr)
>  {
>  	u8 *keybuf = key->key;
>  
> @@ -129,7 +129,7 @@ static u8 fill_sms4_pair(struct hif_wapi_pairwise_key *msg,
>  }
>  
>  static u8 fill_sms4_group(struct hif_wapi_group_key *msg,
> -			       struct ieee80211_key_conf *key)
> +			  struct ieee80211_key_conf *key)
>  {
>  	u8 *keybuf = key->key;
>  
> @@ -143,8 +143,8 @@ static u8 fill_sms4_group(struct hif_wapi_group_key *msg,
>  }
>  
>  static u8 fill_aes_cmac_group(struct hif_igtk_group_key *msg,
> -				   struct ieee80211_key_conf *key,
> -				   struct ieee80211_key_seq *seq)
> +			      struct ieee80211_key_conf *key,
> +			      struct ieee80211_key_seq *seq)
>  {
>  	WARN(key->keylen != sizeof(msg->igtk_key_data), "inconsistent data");
>  	memcpy(msg->igtk_key_data, key->key, key->keylen);
> -- 
> 2.33.0
>
Jérôme Pouiller Sept. 10, 2021, 5:12 p.m. UTC | #2 
On Friday 10 September 2021 18:57:43 CEST Kari Argillander wrote:
> 
> On Fri, Sep 10, 2021 at 06:05:04PM +0200, Jerome Pouiller wrote:
> > From: Jérôme Pouiller <jerome.pouiller@silabs.com>
> >
> > Function arguments must be aligned with left parenthesis. Apply that
> > rule.
> 
> To my eyes something still go wrong with this patch. Might be my email
> fault, but every other patch looks ok. Now these are too left.

I don't try anymore to check alignments with my email viewer. The
original patch is as I expect (and I take care to send my patch with
base64 to avoid pitfalls with MS Exchange). So, I think the is correct.

> Also it should alight with first argument not left parenthesis?

Absolutely.
Kari Argillander Sept. 10, 2021, 5:28 p.m. UTC | #3 
On Fri, Sep 10, 2021 at 07:12:28PM +0200, Jérôme Pouiller wrote:
> On Friday 10 September 2021 18:57:43 CEST Kari Argillander wrote:
> > 
> > On Fri, Sep 10, 2021 at 06:05:04PM +0200, Jerome Pouiller wrote:
> > > From: Jérôme Pouiller <jerome.pouiller@silabs.com>
> > >
> > > Function arguments must be aligned with left parenthesis. Apply that
> > > rule.
> > 
> > To my eyes something still go wrong with this patch. Might be my email
> > fault, but every other patch looks ok. Now these are too left.
> 
> I don't try anymore to check alignments with my email viewer. The
> original patch is as I expect (and I take care to send my patch with
> base64 to avoid pitfalls with MS Exchange). So, I think the is correct.

It was correct. Nice to now know about that something funny is happening
with my part.

> 
> > Also it should alight with first argument not left parenthesis?
> 
> Absolutely.
> 
> 
> -- 
> Jérôme Pouiller
> 
>
diff mbox series

Patch

diff --git a/drivers/staging/wfx/hif_tx_mib.c b/drivers/staging/wfx/hif_tx_mib.c
index 45e531d996bd..97e961e6bcf6 100644
--- a/drivers/staging/wfx/hif_tx_mib.c
+++ b/drivers/staging/wfx/hif_tx_mib.c
@@ -75,7 +75,7 @@  int hif_get_counters_table(struct wfx_dev *wdev, int vif_id,
 	} else {
 		return hif_read_mib(wdev, vif_id,
 				    HIF_MIB_ID_EXTENDED_COUNTERS_TABLE, arg,
-				sizeof(struct hif_mib_extended_count_table));
+				    sizeof(struct hif_mib_extended_count_table));
 	}
 }
 
diff --git a/drivers/staging/wfx/key.c b/drivers/staging/wfx/key.c
index 51a528102016..65134a174683 100644
--- a/drivers/staging/wfx/key.c
+++ b/drivers/staging/wfx/key.c
@@ -31,7 +31,7 @@  static void wfx_free_key(struct wfx_dev *wdev, int idx)
 }
 
 static u8 fill_wep_pair(struct hif_wep_pairwise_key *msg,
-			     struct ieee80211_key_conf *key, u8 *peer_addr)
+			struct ieee80211_key_conf *key, u8 *peer_addr)
 {
 	WARN(key->keylen > sizeof(msg->key_data), "inconsistent data");
 	msg->key_length = key->keylen;
@@ -41,7 +41,7 @@  static u8 fill_wep_pair(struct hif_wep_pairwise_key *msg,
 }
 
 static u8 fill_wep_group(struct hif_wep_group_key *msg,
-			      struct ieee80211_key_conf *key)
+			 struct ieee80211_key_conf *key)
 {
 	WARN(key->keylen > sizeof(msg->key_data), "inconsistent data");
 	msg->key_id = key->keyidx;
@@ -51,7 +51,7 @@  static u8 fill_wep_group(struct hif_wep_group_key *msg,
 }
 
 static u8 fill_tkip_pair(struct hif_tkip_pairwise_key *msg,
-			      struct ieee80211_key_conf *key, u8 *peer_addr)
+			 struct ieee80211_key_conf *key, u8 *peer_addr)
 {
 	u8 *keybuf = key->key;
 
@@ -68,9 +68,9 @@  static u8 fill_tkip_pair(struct hif_tkip_pairwise_key *msg,
 }
 
 static u8 fill_tkip_group(struct hif_tkip_group_key *msg,
-			       struct ieee80211_key_conf *key,
-			       struct ieee80211_key_seq *seq,
-			       enum nl80211_iftype iftype)
+			  struct ieee80211_key_conf *key,
+			  struct ieee80211_key_seq *seq,
+			  enum nl80211_iftype iftype)
 {
 	u8 *keybuf = key->key;
 
@@ -93,7 +93,7 @@  static u8 fill_tkip_group(struct hif_tkip_group_key *msg,
 }
 
 static u8 fill_ccmp_pair(struct hif_aes_pairwise_key *msg,
-			      struct ieee80211_key_conf *key, u8 *peer_addr)
+			 struct ieee80211_key_conf *key, u8 *peer_addr)
 {
 	WARN(key->keylen != sizeof(msg->aes_key_data), "inconsistent data");
 	ether_addr_copy(msg->peer_address, peer_addr);
@@ -102,8 +102,8 @@  static u8 fill_ccmp_pair(struct hif_aes_pairwise_key *msg,
 }
 
 static u8 fill_ccmp_group(struct hif_aes_group_key *msg,
-			       struct ieee80211_key_conf *key,
-			       struct ieee80211_key_seq *seq)
+			  struct ieee80211_key_conf *key,
+			  struct ieee80211_key_seq *seq)
 {
 	WARN(key->keylen != sizeof(msg->aes_key_data), "inconsistent data");
 	memcpy(msg->aes_key_data, key->key, key->keylen);
@@ -114,7 +114,7 @@  static u8 fill_ccmp_group(struct hif_aes_group_key *msg,
 }
 
 static u8 fill_sms4_pair(struct hif_wapi_pairwise_key *msg,
-			      struct ieee80211_key_conf *key, u8 *peer_addr)
+			 struct ieee80211_key_conf *key, u8 *peer_addr)
 {
 	u8 *keybuf = key->key;
 
@@ -129,7 +129,7 @@  static u8 fill_sms4_pair(struct hif_wapi_pairwise_key *msg,
 }
 
 static u8 fill_sms4_group(struct hif_wapi_group_key *msg,
-			       struct ieee80211_key_conf *key)
+			  struct ieee80211_key_conf *key)
 {
 	u8 *keybuf = key->key;
 
@@ -143,8 +143,8 @@  static u8 fill_sms4_group(struct hif_wapi_group_key *msg,
 }
 
 static u8 fill_aes_cmac_group(struct hif_igtk_group_key *msg,
-				   struct ieee80211_key_conf *key,
-				   struct ieee80211_key_seq *seq)
+			      struct ieee80211_key_conf *key,
+			      struct ieee80211_key_seq *seq)
 {
 	WARN(key->keylen != sizeof(msg->igtk_key_data), "inconsistent data");
 	memcpy(msg->igtk_key_data, key->key, key->keylen);