public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
@ 2010-03-19 17:08 Lars Lindley
  2010-03-19 17:11 ` Lars Lindley
  2010-03-20  0:10 ` Pavel Machek
  0 siblings, 2 replies; 8+ messages in thread
From: Lars Lindley @ 2010-03-19 17:08 UTC (permalink / raw)
  To: gregkh, greg, penberg, pavel; +Cc: devel, linux-kernel, Lars Lindley

I fixed all coding style issues found by checkpatch.pl
and converted argument names away from CamelCase and
hungarian notation.

Signed-off-by: Lars Lindley <lindley@coyote.org>
---
 drivers/staging/winbond/mlmetxrx.c |   79 +++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
index f856b94..76b79f0 100644
--- a/drivers/staging/winbond/mlmetxrx.c
+++ b/drivers/staging/winbond/mlmetxrx.c
@@ -1,28 +1,25 @@
-//============================================================================
-//  Module Name:
-//    MLMETxRx.C
-//
-//  Description:
-//    The interface between MDS (MAC Data Service) and MLME.
-//
-//  Revision History:
-//  --------------------------------------------------------------------------
-//          200209      UN20 Jennifer Xu
-//                      Initial Release
-//          20021108    PD43 Austin Liu
-//          20030117    PD43 Austin Liu
-//                      Deleted MLMEReturnPacket and MLMEProcThread()
-//
-//  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
-//============================================================================
+/*
+ * ============================================================================
+ * Module Name:
+ *    MLMETxRx.C
+ *
+ *  Description:
+ *    The interface between MDS (MAC Data Service) and MLME.
+ *
+ *  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
+ * ============================================================================
+ */
 #include "sysdef.h"
 
 #include "mds_f.h"
 
-//=============================================================================
-u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
-/*	DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
-				FRAME_TYPE_802_11_DATA */
+/*
+ * ============================================================================
+ * DataType:	FRAME_TYPE_802_11_MANAGEMENT,
+ *		FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
+ *		FRAME_TYPE_802_11_DATA
+ */
+u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *mmpdu, u16 len, u8 datatype)
 {
 	if (adapter->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) {
 		adapter->sMlmeFrame.wNumTxMMPDUDiscarded++;
@@ -30,17 +27,19 @@ u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
 	}
 	adapter->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME;
 
-	// Keep information for sending
-	adapter->sMlmeFrame.pMMPDU = pMMPDU;
-	adapter->sMlmeFrame.DataType = DataType;
-	// len must be the last setting due to QUERY_SIZE_SECOND of Mds
+	/* Keep information for sending */
+	adapter->sMlmeFrame.pMMPDU = mmpdu;
+	adapter->sMlmeFrame.DataType = datatype;
+	/* len must be the last setting due to QUERY_SIZE_SECOND of Mds */
 	adapter->sMlmeFrame.len = len;
 	adapter->sMlmeFrame.wNumTxMMPDU++;
 
-	// H/W will enter power save by set the register. S/W don't send null frame
-	//with PWRMgt bit enbled to enter power save now.
+	/*
+	 * H/W will enter power save by set the register. S/W don't send null
+	 * frame with PWRMgt bit enbled to enter power save now.
+	 */
 
-	// Transmit NDIS packet
+	/* Transmit NDIS packet */
 	Mds_Tx(adapter);
 	return true;
 }
@@ -56,38 +55,34 @@ void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *des
 	desc->Type = adapter->sMlmeFrame.DataType;
 }
 
-static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
+static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *data)
 {
 	int i;
 
-	// Reclaim the data buffer
+	/* Reclaim the data buffer */
 	for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
-		if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
+		if (data == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
 			break;
 	}
 	if (adapter->sMlmeFrame.TxMMPDUInUse[i])
 		adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
-	else  {
-		// Something wrong
-		// PD43 Add debug code here???
+	else {
+		/* Something wrong */
+		/* PD43 Add debug code here??? */
 	}
 }
 
-void
-MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK)
+void MLME_SendComplete(struct wbsoft_priv *adapter, u8 packetid, unsigned char sendok)
 {
 	MLME_TXCALLBACK	TxCallback;
 
-    // Reclaim the data buffer
+	/* Reclaim the data buffer */
 	adapter->sMlmeFrame.len = 0;
-	MLMEfreeMMPDUBuffer( adapter, adapter->sMlmeFrame.pMMPDU );
-
+	MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
 
 	TxCallback.bResult = MLME_SUCCESS;
 
-	// Return resource
+	/* Return resource */
 	adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
 }
 
-
-
-- 
1.7.0.2


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
  2010-03-19 17:08 [PATCH] staging: winbond: mlmetxrx.c Coding style fixes Lars Lindley
@ 2010-03-19 17:11 ` Lars Lindley
  2010-03-20  0:10 ` Pavel Machek
  1 sibling, 0 replies; 8+ messages in thread
From: Lars Lindley @ 2010-03-19 17:11 UTC (permalink / raw)
  To: Lars Lindley; +Cc: gregkh, greg, penberg, pavel, devel, linux-kernel

It builds fine and generated .o file is identical to the one from a clean tree.

/Lars

On 2010-03-19 18:08, Lars Lindley wrote:
> I fixed all coding style issues found by checkpatch.pl
> and converted argument names away from CamelCase and
> hungarian notation.
> 
> Signed-off-by: Lars Lindley <lindley@coyote.org>
> ---
>  drivers/staging/winbond/mlmetxrx.c |   79 +++++++++++++++++-------------------
>  1 files changed, 37 insertions(+), 42 deletions(-)
> 
> diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
> index f856b94..76b79f0 100644
> --- a/drivers/staging/winbond/mlmetxrx.c
> +++ b/drivers/staging/winbond/mlmetxrx.c
> @@ -1,28 +1,25 @@
> -//============================================================================
> -//  Module Name:
> -//    MLMETxRx.C
> -//
> -//  Description:
> -//    The interface between MDS (MAC Data Service) and MLME.
> -//
> -//  Revision History:
> -//  --------------------------------------------------------------------------
> -//          200209      UN20 Jennifer Xu
> -//                      Initial Release
> -//          20021108    PD43 Austin Liu
> -//          20030117    PD43 Austin Liu
> -//                      Deleted MLMEReturnPacket and MLMEProcThread()
> -//
> -//  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
> -//============================================================================
> +/*
> + * ============================================================================
> + * Module Name:
> + *    MLMETxRx.C
> + *
> + *  Description:
> + *    The interface between MDS (MAC Data Service) and MLME.
> + *
> + *  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
> + * ============================================================================
> + */
>  #include "sysdef.h"
>  
>  #include "mds_f.h"
>  
> -//=============================================================================
> -u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
> -/*	DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
> -				FRAME_TYPE_802_11_DATA */
> +/*
> + * ============================================================================
> + * DataType:	FRAME_TYPE_802_11_MANAGEMENT,
> + *		FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
> + *		FRAME_TYPE_802_11_DATA
> + */
> +u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *mmpdu, u16 len, u8 datatype)
>  {
>  	if (adapter->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) {
>  		adapter->sMlmeFrame.wNumTxMMPDUDiscarded++;
> @@ -30,17 +27,19 @@ u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
>  	}
>  	adapter->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME;
>  
> -	// Keep information for sending
> -	adapter->sMlmeFrame.pMMPDU = pMMPDU;
> -	adapter->sMlmeFrame.DataType = DataType;
> -	// len must be the last setting due to QUERY_SIZE_SECOND of Mds
> +	/* Keep information for sending */
> +	adapter->sMlmeFrame.pMMPDU = mmpdu;
> +	adapter->sMlmeFrame.DataType = datatype;
> +	/* len must be the last setting due to QUERY_SIZE_SECOND of Mds */
>  	adapter->sMlmeFrame.len = len;
>  	adapter->sMlmeFrame.wNumTxMMPDU++;
>  
> -	// H/W will enter power save by set the register. S/W don't send null frame
> -	//with PWRMgt bit enbled to enter power save now.
> +	/*
> +	 * H/W will enter power save by set the register. S/W don't send null
> +	 * frame with PWRMgt bit enbled to enter power save now.
> +	 */
>  
> -	// Transmit NDIS packet
> +	/* Transmit NDIS packet */
>  	Mds_Tx(adapter);
>  	return true;
>  }
> @@ -56,38 +55,34 @@ void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *des
>  	desc->Type = adapter->sMlmeFrame.DataType;
>  }
>  
> -static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
> +static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *data)
>  {
>  	int i;
>  
> -	// Reclaim the data buffer
> +	/* Reclaim the data buffer */
>  	for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
> -		if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
> +		if (data == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
>  			break;
>  	}
>  	if (adapter->sMlmeFrame.TxMMPDUInUse[i])
>  		adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
> -	else  {
> -		// Something wrong
> -		// PD43 Add debug code here???
> +	else {
> +		/* Something wrong */
> +		/* PD43 Add debug code here??? */
>  	}
>  }
>  
> -void
> -MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK)
> +void MLME_SendComplete(struct wbsoft_priv *adapter, u8 packetid, unsigned char sendok)
>  {
>  	MLME_TXCALLBACK	TxCallback;
>  
> -    // Reclaim the data buffer
> +	/* Reclaim the data buffer */
>  	adapter->sMlmeFrame.len = 0;
> -	MLMEfreeMMPDUBuffer( adapter, adapter->sMlmeFrame.pMMPDU );
> -
> +	MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
>  
>  	TxCallback.bResult = MLME_SUCCESS;
>  
> -	// Return resource
> +	/* Return resource */
>  	adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
>  }
>  
> -
> -

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
  2010-03-19 17:08 [PATCH] staging: winbond: mlmetxrx.c Coding style fixes Lars Lindley
  2010-03-19 17:11 ` Lars Lindley
@ 2010-03-20  0:10 ` Pavel Machek
  2010-03-20  8:09   ` Lars Lindley
  1 sibling, 1 reply; 8+ messages in thread
From: Pavel Machek @ 2010-03-20  0:10 UTC (permalink / raw)
  To: Lars Lindley; +Cc: gregkh, greg, penberg, devel, linux-kernel

Hi!

And thanks for the effort.

> +u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *mmpdu, u16 len, u8 datatype)
>  {
>  	if (adapter->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) {
>  		adapter->sMlmeFrame.wNumTxMMPDUDiscarded++;
> @@ -30,17 +27,19 @@ u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
>  	}
>  	adapter->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME;
>  
> -	// Keep information for sending
> -	adapter->sMlmeFrame.pMMPDU = pMMPDU;
> -	adapter->sMlmeFrame.DataType = DataType;
> -	// len must be the last setting due to QUERY_SIZE_SECOND of Mds
> +	/* Keep information for sending */
> +	adapter->sMlmeFrame.pMMPDU = mmpdu;

I'm not sure if 'mmpdu' is good name. But I don't know what it stands
for, either, so...

> +	adapter->sMlmeFrame.DataType = datatype;

data_type, please...

									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
  2010-03-20  0:10 ` Pavel Machek
@ 2010-03-20  8:09   ` Lars Lindley
  2010-03-21 12:42     ` Pekka Enberg
  0 siblings, 1 reply; 8+ messages in thread
From: Lars Lindley @ 2010-03-20  8:09 UTC (permalink / raw)
  To: Pavel Machek; +Cc: gregkh, greg, penberg, devel, linux-kernel

Hi!

No problem..It's fun to make a contribution.

On 2010-03-20 01:10, Pavel Machek wrote:
> Hi!
> 
> And thanks for the effort.
>
>> +	adapter->sMlmeFrame.pMMPDU = mmpdu;
> 
> I'm not sure if 'mmpdu' is good name. But I don't know what it stands
> for, either, so...
> 
I have no idea what it is either. Someone who knows what it is might have
a better name up their sleeve..

>> +	adapter->sMlmeFrame.DataType = datatype;
> 
> data_type, please...
> 
> 									Pavel
> 

Fixed..And also send_ok and packet_id..

The generated .o is identical to the one from a clean tree..

Here's a patch that applies after the old one..



[PATCH] staging: winbond: mlmetxrx.c func. argument name change.

I changed some function argument names to make them more readable.

Signed-off-by: Lars Lindley <lindley@coyote.org>
---
 drivers/staging/winbond/mlmetxrx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
index 76b79f0..a8f4b8b 100644
--- a/drivers/staging/winbond/mlmetxrx.c
+++ b/drivers/staging/winbond/mlmetxrx.c
@@ -19,7 +19,7 @@
  *		FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
  *		FRAME_TYPE_802_11_DATA
  */
-u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *mmpdu, u16 len, u8 datatype)
+u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *mmpdu, u16 len, u8 data_type)
 {
 	if (adapter->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) {
 		adapter->sMlmeFrame.wNumTxMMPDUDiscarded++;
@@ -29,7 +29,7 @@ u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *mmpdu, u16 len, u8 datatype)
 
 	/* Keep information for sending */
 	adapter->sMlmeFrame.pMMPDU = mmpdu;
-	adapter->sMlmeFrame.DataType = datatype;
+	adapter->sMlmeFrame.DataType = data_type;
 	/* len must be the last setting due to QUERY_SIZE_SECOND of Mds */
 	adapter->sMlmeFrame.len = len;
 	adapter->sMlmeFrame.wNumTxMMPDU++;
@@ -72,7 +72,7 @@ static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *data)
 	}
 }
 
-void MLME_SendComplete(struct wbsoft_priv *adapter, u8 packetid, unsigned char sendok)
+void MLME_SendComplete(struct wbsoft_priv *adapter, u8 packet_id, unsigned char send_ok)
 {
 	MLME_TXCALLBACK	TxCallback;
 
-- 
1.7.0.2

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
  2010-03-20  8:09   ` Lars Lindley
@ 2010-03-21 12:42     ` Pekka Enberg
  2010-04-28 22:57       ` Greg KH
  0 siblings, 1 reply; 8+ messages in thread
From: Pekka Enberg @ 2010-03-21 12:42 UTC (permalink / raw)
  To: Lars Lindley; +Cc: Pavel Machek, gregkh, greg, devel, linux-kernel

Lars Lindley wrote:
> [PATCH] staging: winbond: mlmetxrx.c func. argument name change.
> 
> I changed some function argument names to make them more readable.
> 
> Signed-off-by: Lars Lindley <lindley@coyote.org>

I'd much rather see a new version of the patch that squashes the fixlet but:

Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
  2010-03-21 12:42     ` Pekka Enberg
@ 2010-04-28 22:57       ` Greg KH
  2010-05-02  8:40         ` Lars Lindley
  0 siblings, 1 reply; 8+ messages in thread
From: Greg KH @ 2010-04-28 22:57 UTC (permalink / raw)
  To: Pekka Enberg; +Cc: Lars Lindley, Pavel Machek, gregkh, devel, linux-kernel

On Sun, Mar 21, 2010 at 02:42:31PM +0200, Pekka Enberg wrote:
> Lars Lindley wrote:
> >[PATCH] staging: winbond: mlmetxrx.c func. argument name change.
> >
> >I changed some function argument names to make them more readable.
> >
> >Signed-off-by: Lars Lindley <lindley@coyote.org>
> 
> I'd much rather see a new version of the patch that squashes the fixlet but:
> 
> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>a

Yes, can you merge both of these together into one patch?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
  2010-04-28 22:57       ` Greg KH
@ 2010-05-02  8:40         ` Lars Lindley
  2010-05-03 18:47           ` Greg KH
  0 siblings, 1 reply; 8+ messages in thread
From: Lars Lindley @ 2010-05-02  8:40 UTC (permalink / raw)
  To: Greg KH; +Cc: Pekka Enberg, Pavel Machek, gregkh, devel, linux-kernel



On 2010-04-29 00:57, Greg KH wrote:
> On Sun, Mar 21, 2010 at 02:42:31PM +0200, Pekka Enberg wrote:
>> Lars Lindley wrote:
>>> [PATCH] staging: winbond: mlmetxrx.c func. argument name change.
>>>
>>> I changed some function argument names to make them more readable.
>>>
>>> Signed-off-by: Lars Lindley <lindley@coyote.org>
>>
>> I'd much rather see a new version of the patch that squashes the fixlet but:
>>
>> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>a
> 
> Yes, can you merge both of these together into one patch?
> 
> thanks,
> 
> greg k-h
> 


OK, same thing here. Rebase doesnt work for med but here's a diff of mlmetxrx.c that includes
both patches.


diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
index f856b94..a8f4b8b 100644
--- a/drivers/staging/winbond/mlmetxrx.c
+++ b/drivers/staging/winbond/mlmetxrx.c
@@ -1,28 +1,25 @@
-//============================================================================
-//  Module Name:
-//    MLMETxRx.C
-//
-//  Description:
-//    The interface between MDS (MAC Data Service) and MLME.
-//
-//  Revision History:
-//  --------------------------------------------------------------------------
-//          200209      UN20 Jennifer Xu
-//                      Initial Release
-//          20021108    PD43 Austin Liu
-//          20030117    PD43 Austin Liu
-//                      Deleted MLMEReturnPacket and MLMEProcThread()
-//
-//  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
-//============================================================================
+/*
+ * ============================================================================
+ * Module Name:
+ *    MLMETxRx.C
+ *
+ *  Description:
+ *    The interface between MDS (MAC Data Service) and MLME.
+ *
+ *  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
+ * ============================================================================
+ */
 #include "sysdef.h"
 
 #include "mds_f.h"
 
-//=============================================================================
-u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
-/*	DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
-				FRAME_TYPE_802_11_DATA */
+/*
+ * ============================================================================
+ * DataType:	FRAME_TYPE_802_11_MANAGEMENT,
+ *		FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
+ *		FRAME_TYPE_802_11_DATA
+ */
+u8 MLMESendFrame(struct wbsoft_priv *adapter, u8 *mmpdu, u16 len, u8 data_type)
 {
 	if (adapter->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) {
 		adapter->sMlmeFrame.wNumTxMMPDUDiscarded++;
@@ -30,17 +27,19 @@ u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
 	}
 	adapter->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME;
 
-	// Keep information for sending
-	adapter->sMlmeFrame.pMMPDU = pMMPDU;
-	adapter->sMlmeFrame.DataType = DataType;
-	// len must be the last setting due to QUERY_SIZE_SECOND of Mds
+	/* Keep information for sending */
+	adapter->sMlmeFrame.pMMPDU = mmpdu;
+	adapter->sMlmeFrame.DataType = data_type;
+	/* len must be the last setting due to QUERY_SIZE_SECOND of Mds */
 	adapter->sMlmeFrame.len = len;
 	adapter->sMlmeFrame.wNumTxMMPDU++;
 
-	// H/W will enter power save by set the register. S/W don't send null frame
-	//with PWRMgt bit enbled to enter power save now.
+	/*
+	 * H/W will enter power save by set the register. S/W don't send null
+	 * frame with PWRMgt bit enbled to enter power save now.
+	 */
 
-	// Transmit NDIS packet
+	/* Transmit NDIS packet */
 	Mds_Tx(adapter);
 	return true;
 }
@@ -56,38 +55,34 @@ void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *des
 	desc->Type = adapter->sMlmeFrame.DataType;
 }
 
-static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
+static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *data)
 {
 	int i;
 
-	// Reclaim the data buffer
+	/* Reclaim the data buffer */
 	for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
-		if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
+		if (data == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
 			break;
 	}
 	if (adapter->sMlmeFrame.TxMMPDUInUse[i])
 		adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
-	else  {
-		// Something wrong
-		// PD43 Add debug code here???
+	else {
+		/* Something wrong */
+		/* PD43 Add debug code here??? */
 	}
 }
 
-void
-MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK)
+void MLME_SendComplete(struct wbsoft_priv *adapter, u8 packet_id, unsigned char send_ok)
 {
 	MLME_TXCALLBACK	TxCallback;
 
-    // Reclaim the data buffer
+	/* Reclaim the data buffer */
 	adapter->sMlmeFrame.len = 0;
-	MLMEfreeMMPDUBuffer( adapter, adapter->sMlmeFrame.pMMPDU );
-
+	MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
 
 	TxCallback.bResult = MLME_SUCCESS;
 
-	// Return resource
+	/* Return resource */
 	adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
 }
 
-
-

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] staging: winbond: mlmetxrx.c Coding style fixes.
  2010-05-02  8:40         ` Lars Lindley
@ 2010-05-03 18:47           ` Greg KH
  0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2010-05-03 18:47 UTC (permalink / raw)
  To: Lars Lindley; +Cc: Pekka Enberg, Pavel Machek, gregkh, devel, linux-kernel

On Sun, May 02, 2010 at 10:40:02AM +0200, Lars Lindley wrote:
> 
> 
> On 2010-04-29 00:57, Greg KH wrote:
> > On Sun, Mar 21, 2010 at 02:42:31PM +0200, Pekka Enberg wrote:
> >> Lars Lindley wrote:
> >>> [PATCH] staging: winbond: mlmetxrx.c func. argument name change.
> >>>
> >>> I changed some function argument names to make them more readable.
> >>>
> >>> Signed-off-by: Lars Lindley <lindley@coyote.org>
> >>
> >> I'd much rather see a new version of the patch that squashes the fixlet but:
> >>
> >> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>a
> > 
> > Yes, can you merge both of these together into one patch?
> > 
> > thanks,
> > 
> > greg k-h
> > 
> 
> 
> OK, same thing here. Rebase doesnt work for med but here's a diff of mlmetxrx.c that includes
> both patches.

This didn't apply to the linux-next tree :(

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2010-05-03 19:11 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 17:08 [PATCH] staging: winbond: mlmetxrx.c Coding style fixes Lars Lindley
2010-03-19 17:11 ` Lars Lindley
2010-03-20  0:10 ` Pavel Machek
2010-03-20  8:09   ` Lars Lindley
2010-03-21 12:42     ` Pekka Enberg
2010-04-28 22:57       ` Greg KH
2010-05-02  8:40         ` Lars Lindley
2010-05-03 18:47           ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox