public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/6] staging: winbond: Cleanups
@ 2010-03-19 20:40 Sankar P
  2010-03-19 20:40 ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Sankar P
  2010-03-21 12:40 ` [PATCH 0/6] staging: winbond: Cleanups Pekka Enberg
  0 siblings, 2 replies; 15+ messages in thread
From: Sankar P @ 2010-03-19 20:40 UTC (permalink / raw)
  To: gregkh, pavel, penberg, devel, linux-kernel, sankar.curiosity

The following series of patches are cleanups on the winbond driver
under staging. Some typedefs are converted to structs and
an un-used enumeration and a typedef are removed. 

Sankar P (6):
  staging: winbond: Convert typedef struct _PMKID to struct pmkid
  staging: winbond: Remove unused enum enum_PowerManagementMode
  staging: winbond: Convert typedef struct _STRUCT_SELECTOR
  staging: winbond: Remove typedef for standard types
  staging: winbond: Convert typedef struct _MLME_FRAME to struct
  staging: winbond: Convert typedef struct _SCAN_REQ_PARA to struct

 drivers/staging/winbond/core.h            |    2 +-
 drivers/staging/winbond/mac_structures.h  |   31 +++++++++++-----------------
 drivers/staging/winbond/mlme_s.h          |    4 +-
 drivers/staging/winbond/phy_calibration.c |    9 ++-----
 drivers/staging/winbond/scan_s.h          |    8 ++++--
 5 files changed, 23 insertions(+), 31 deletions(-)


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

* [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid
  2010-03-19 20:40 [PATCH 0/6] staging: winbond: Cleanups Sankar P
@ 2010-03-19 20:40 ` Sankar P
  2010-03-19 20:41   ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Sankar P
  2010-03-20  0:13   ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Pavel Machek
  2010-03-21 12:40 ` [PATCH 0/6] staging: winbond: Cleanups Pekka Enberg
  1 sibling, 2 replies; 15+ messages in thread
From: Sankar P @ 2010-03-19 20:40 UTC (permalink / raw)
  To: gregkh, pavel, penberg, devel, linux-kernel, sankar.curiosity

This patch converts the definition typedef struct _PMKID to
struct pmkid and also the part where the typedef was used.

Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
---
 drivers/staging/winbond/mac_structures.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index 0d16196..ad19c88 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -505,10 +505,10 @@ struct RSN_Capability_Element
 }__attribute__ ((packed)) ;
 
 #ifdef _WPA2_
-typedef struct _PMKID
+struct pmkid
 {
   u8 pValue[16];
-}PMKID;
+};
 
 struct	WPA2_RSN_Information_Element
 {
@@ -531,7 +531,7 @@ struct WPA2_RSN_Auth_Sub_Information_Element
 struct PMKID_Information_Element
 {
 	u16				PMKID_Count;
-	PMKID pmkid [16] ;
+	struct pmkid pmkid[16];
 }__attribute__ ((packed));
 
 #endif //enddef _WPA2_
-- 
1.6.4.2


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

* [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode
  2010-03-19 20:40 ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Sankar P
@ 2010-03-19 20:41   ` Sankar P
  2010-03-19 20:41     ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Sankar P
  2010-03-20  0:14     ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Pavel Machek
  2010-03-20  0:13   ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Pavel Machek
  1 sibling, 2 replies; 15+ messages in thread
From: Sankar P @ 2010-03-19 20:41 UTC (permalink / raw)
  To: gregkh, pavel, penberg, devel, linux-kernel, sankar.curiosity

Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
---
 drivers/staging/winbond/mac_structures.h |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index ad19c88..7eb0e57 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -116,13 +116,6 @@
 #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT    ((u16) 6)
 #define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT  ((u16) 2)
 
-//========================================================
-typedef enum enum_PowerManagementMode
-{
-    ACTIVE = 0,
-    POWER_SAVE
-} WB_PM_Mode, *PWB_PM_MODE;
-
 //===================================================================
 //  Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
 //  length of ReasonCode is 2 Octs.
-- 
1.6.4.2


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

* [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR
  2010-03-19 20:41   ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Sankar P
@ 2010-03-19 20:41     ` Sankar P
  2010-03-19 20:41       ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Sankar P
  2010-03-20  0:15       ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Pavel Machek
  2010-03-20  0:14     ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Pavel Machek
  1 sibling, 2 replies; 15+ messages in thread
From: Sankar P @ 2010-03-19 20:41 UTC (permalink / raw)
  To: gregkh, pavel, penberg, devel, linux-kernel, sankar.curiosity

This patch converts the declaration typedef struct _STRUCT_SELECTOR
to struct struct_selector and also the places where it was used.

Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
---
 drivers/staging/winbond/mac_structures.h |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index 7eb0e57..4130cf6 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -436,7 +436,7 @@ struct Extended_Supported_Rates_Element
 #define OUI_CIPHER_CCMP				0x04
 #define OUI_CIPHER_WEP_104			0x05
 
-typedef struct _SUITE_SELECTOR_
+struct suite_selector
 {
 	union
 	{
@@ -447,23 +447,23 @@ typedef struct _SUITE_SELECTOR_
 			u8	Type;
 		}SuitSelector;
 	};
-}SUITE_SELECTOR;
+};
 
 //--  WPA  --
 struct	RSN_Information_Element
 {
 	u8					Element_ID;
 	u8					Length;
-	SUITE_SELECTOR	OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01
+	struct suite_selector	OuiWPAAdditional; /* WPA version 2.0 additional field, and should be 00:50:F2:01 */
 	u16					Version;
-	SUITE_SELECTOR		GroupKeySuite;
+	struct suite_selector		GroupKeySuite;
 	u16					PairwiseKeySuiteCount;
-	SUITE_SELECTOR		PairwiseKeySuite[1];
+	struct suite_selector		PairwiseKeySuite[1];
 }__attribute__ ((packed));
 struct RSN_Auth_Sub_Information_Element
 {
 	u16				AuthKeyMngtSuiteCount;
-	SUITE_SELECTOR	AuthKeyMngtSuite[1];
+	struct suite_selector	AuthKeyMngtSuite[1];
 }__attribute__ ((packed));
 
 //--  WPA2  --
@@ -508,16 +508,16 @@ struct	WPA2_RSN_Information_Element
 	u8					Element_ID;
 	u8					Length;
 	u16					Version;
-	SUITE_SELECTOR		GroupKeySuite;
+	struct suite_selector		GroupKeySuite;
 	u16					PairwiseKeySuiteCount;
-	SUITE_SELECTOR		PairwiseKeySuite[1];
+	struct suite_selector		PairwiseKeySuite[1];
 
 }__attribute__ ((packed));
 
 struct WPA2_RSN_Auth_Sub_Information_Element
 {
 	u16				AuthKeyMngtSuiteCount;
-	SUITE_SELECTOR	AuthKeyMngtSuite[1];
+	struct suite_selector	AuthKeyMngtSuite[1];
 }__attribute__ ((packed));
 
 
-- 
1.6.4.2


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

* [PATCH 4/6] staging: winbond: Remove typedef for standard types
  2010-03-19 20:41     ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Sankar P
@ 2010-03-19 20:41       ` Sankar P
  2010-03-19 20:41         ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME to struct Sankar P
  2010-03-20  0:16         ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Pavel Machek
  2010-03-20  0:15       ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Pavel Machek
  1 sibling, 2 replies; 15+ messages in thread
From: Sankar P @ 2010-03-19 20:41 UTC (permalink / raw)
  To: gregkh, pavel, penberg, devel, linux-kernel, sankar.curiosity

Remove the typedef named "fixed" used for the standard type s32

Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
---
 drivers/staging/winbond/phy_calibration.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c
index 8c56962..a8334f9 100644
--- a/drivers/staging/winbond/phy_calibration.c
+++ b/drivers/staging/winbond/phy_calibration.c
@@ -25,10 +25,7 @@
 #define FIXED(X)        ((s32)((X) * 32768.0))
 #define DEG2RAD(X)      0.017453 * (X)
 
-/****************** LOCAL TYPE DEFINITION SECTION ***************************/
-typedef s32         fixed; /* 16.16 fixed-point */
-
-static const fixed Angles[]=
+static const s32 Angles[] =
 {
     FIXED(DEG2RAD(45.0)),    FIXED(DEG2RAD(26.565)),  FIXED(DEG2RAD(14.0362)),
     FIXED(DEG2RAD(7.12502)), FIXED(DEG2RAD(3.57633)), FIXED(DEG2RAD(1.78991)),
@@ -300,7 +297,7 @@ u32 _sqrt(u32 sqsum)
 /****************************************************************************/
 void _sin_cos(s32 angle, s32 *sin, s32 *cos)
 {
-    fixed       X, Y, TargetAngle, CurrAngle;
+    s32 X, Y, TargetAngle, CurrAngle;
     unsigned    Step;
 
     X=FIXED(AG_CONST);      // AG_CONST * cos(0)
@@ -310,7 +307,7 @@ void _sin_cos(s32 angle, s32 *sin, s32 *cos)
 
     for (Step=0; Step < 12; Step++)
     {
-        fixed NewX;
+	s32 NewX;
 
         if(TargetAngle > CurrAngle)
         {
-- 
1.6.4.2


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

* [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME to struct
  2010-03-19 20:41       ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Sankar P
@ 2010-03-19 20:41         ` Sankar P
  2010-03-19 20:41           ` [PATCH 6/6] staging: winbond: Convert typedef struct _SCAN_REQ_PARA " Sankar P
  2010-03-20  0:17           ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME " Pavel Machek
  2010-03-20  0:16         ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Pavel Machek
  1 sibling, 2 replies; 15+ messages in thread
From: Sankar P @ 2010-03-19 20:41 UTC (permalink / raw)
  To: gregkh, pavel, penberg, devel, linux-kernel, sankar.curiosity

This patch converts the typedef struct _MLME_FRAME to
struct mlme_frame and updates the places where it is used.

Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
---
 drivers/staging/winbond/core.h   |    2 +-
 drivers/staging/winbond/mlme_s.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index 0a2060b..372053a 100644
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -16,7 +16,7 @@ struct wbsoft_priv {
 
 	struct wb_local_para sLocalPara;	// Myself connected parameters
 
-	MLME_FRAME sMlmeFrame;	// connect to peerSTA parameters
+	struct mlme_frame sMlmeFrame;	/* connect to peerSTA parameters */
 
 	struct wb35_mto_params sMtoPara;	// MTO_struct ...
 	struct hw_data sHwData;	//For HAL
diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
index 1217a1c..c95debf 100644
--- a/drivers/staging/winbond/mlme_s.h
+++ b/drivers/staging/winbond/mlme_s.h
@@ -131,7 +131,7 @@
 #define boMLME_IdleScanState(_BB_)	(_BB_->wState==IDLE_SCAN)
 #define boMLME_FoundSTAinfo(_CC_)	(_CC_->wState>=IDLE_SCAN)
 
-typedef struct _MLME_FRAME
+struct mlme_frame
 {
 	//NDIS_PACKET		MLME_Packet;
 	s8 *			pMMPDU;
@@ -156,7 +156,7 @@ typedef struct _MLME_FRAME
 	u16		wNumRxMMPDUInMLME; 	// Number of the Rx MMPDU
 	u16		reserved_1;			//  in MLME.
                     	            //  excluding the discarded
-} MLME_FRAME, *psMLME_FRAME;
+};
 
 typedef struct _AUTHREQ {
 
-- 
1.6.4.2


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

* [PATCH 6/6] staging: winbond: Convert typedef struct _SCAN_REQ_PARA to struct
  2010-03-19 20:41         ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME to struct Sankar P
@ 2010-03-19 20:41           ` Sankar P
  2010-03-20  0:17             ` Pavel Machek
  2010-03-20  0:17           ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME " Pavel Machek
  1 sibling, 1 reply; 15+ messages in thread
From: Sankar P @ 2010-03-19 20:41 UTC (permalink / raw)
  To: gregkh, pavel, penberg, devel, linux-kernel, sankar.curiosity

This patch converts typedef struct _SCAN_REQ_PARA to
struct scan_req_para and the places where it is used.

Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
---
 drivers/staging/winbond/scan_s.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/winbond/scan_s.h b/drivers/staging/winbond/scan_s.h
index 209717f..e677fc4 100644
--- a/drivers/staging/winbond/scan_s.h
+++ b/drivers/staging/winbond/scan_s.h
@@ -31,7 +31,9 @@
 
 ///////////////////////////////////////////////////////////////////////////
 //Global data structures, Initial Scan & Background Scan
-typedef struct _SCAN_REQ_PARA	//mandatory parameters for SCAN request
+
+/* Mandatory parameters for SCAN request */
+struct scan_req_para
 {
 	u32				ScanType;			//passive/active scan
 
@@ -40,14 +42,14 @@ typedef struct _SCAN_REQ_PARA	//mandatory parameters for SCAN request
 	struct SSID_Element	sSSID; // 34B. scan only for this SSID
 	u8			reserved_2[2];
 
-} SCAN_REQ_PARA, *psSCAN_REQ_PARA;
+};
 
 typedef struct _SCAN_PARAMETERS
 {
 	u16				wState;
 	u16				iCurrentChannelIndex;
 
-	SCAN_REQ_PARA	sScanReq;
+	struct scan_req_para	sScanReq;
 
 	u8				BSSID[MAC_ADDR_LENGTH + 2];		//scan only for this BSSID
 
-- 
1.6.4.2


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

* Re: [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid
  2010-03-19 20:40 ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Sankar P
  2010-03-19 20:41   ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Sankar P
@ 2010-03-20  0:13   ` Pavel Machek
  1 sibling, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2010-03-20  0:13 UTC (permalink / raw)
  To: Sankar P; +Cc: gregkh, penberg, devel, linux-kernel

On Sat 2010-03-20 02:10:59, Sankar P wrote:
> This patch converts the definition typedef struct _PMKID to
> struct pmkid and also the part where the typedef was used.
> 
> Signed-off-by: Sankar P <sankar.curiosity@gmail.com>

ACK.

> ---
>  drivers/staging/winbond/mac_structures.h |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
> index 0d16196..ad19c88 100644
> --- a/drivers/staging/winbond/mac_structures.h
> +++ b/drivers/staging/winbond/mac_structures.h
> @@ -505,10 +505,10 @@ struct RSN_Capability_Element
>  }__attribute__ ((packed)) ;
>  
>  #ifdef _WPA2_
> -typedef struct _PMKID
> +struct pmkid
>  {
>    u8 pValue[16];
> -}PMKID;
> +};
>  
>  struct	WPA2_RSN_Information_Element
>  {
> @@ -531,7 +531,7 @@ struct WPA2_RSN_Auth_Sub_Information_Element
>  struct PMKID_Information_Element
>  {
>  	u16				PMKID_Count;
> -	PMKID pmkid [16] ;
> +	struct pmkid pmkid[16];
>  }__attribute__ ((packed));
>  
>  #endif //enddef _WPA2_

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

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

* Re: [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode
  2010-03-19 20:41   ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Sankar P
  2010-03-19 20:41     ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Sankar P
@ 2010-03-20  0:14     ` Pavel Machek
  1 sibling, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2010-03-20  0:14 UTC (permalink / raw)
  To: Sankar P; +Cc: gregkh, penberg, devel, linux-kernel

On Sat 2010-03-20 02:11:00, Sankar P wrote:
> Signed-off-by: Sankar P <sankar.curiosity@gmail.com>

ACK.

> ---
>  drivers/staging/winbond/mac_structures.h |    7 -------
>  1 files changed, 0 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
> index ad19c88..7eb0e57 100644
> --- a/drivers/staging/winbond/mac_structures.h
> +++ b/drivers/staging/winbond/mac_structures.h
> @@ -116,13 +116,6 @@
>  #define WLAN_MAX_PAIRWISE_CIPHER_SUITE_COUNT    ((u16) 6)
>  #define WLAN_MAX_AUTH_KEY_MGT_SUITE_LIST_COUNT  ((u16) 2)
>  
> -//========================================================
> -typedef enum enum_PowerManagementMode
> -{
> -    ACTIVE = 0,
> -    POWER_SAVE
> -} WB_PM_Mode, *PWB_PM_MODE;
> -
>  //===================================================================
>  //  Reason Code (Table 18): indicate the reason of DisAssoc, DeAuthen
>  //  length of ReasonCode is 2 Octs.

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

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

* Re: [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR
  2010-03-19 20:41     ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Sankar P
  2010-03-19 20:41       ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Sankar P
@ 2010-03-20  0:15       ` Pavel Machek
  1 sibling, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2010-03-20  0:15 UTC (permalink / raw)
  To: Sankar P; +Cc: gregkh, penberg, devel, linux-kernel

On Sat 2010-03-20 02:11:01, Sankar P wrote:
> This patch converts the declaration typedef struct _STRUCT_SELECTOR
> to struct struct_selector and also the places where it was used.
> 
> Signed-off-by: Sankar P <sankar.curiosity@gmail.com>

ack.

> ---
>  drivers/staging/winbond/mac_structures.h |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
> index 7eb0e57..4130cf6 100644
> --- a/drivers/staging/winbond/mac_structures.h
> +++ b/drivers/staging/winbond/mac_structures.h
> @@ -436,7 +436,7 @@ struct Extended_Supported_Rates_Element
>  #define OUI_CIPHER_CCMP				0x04
>  #define OUI_CIPHER_WEP_104			0x05
>  
> -typedef struct _SUITE_SELECTOR_
> +struct suite_selector
>  {
>  	union
>  	{
> @@ -447,23 +447,23 @@ typedef struct _SUITE_SELECTOR_
>  			u8	Type;
>  		}SuitSelector;
>  	};
> -}SUITE_SELECTOR;
> +};
>  
>  //--  WPA  --
>  struct	RSN_Information_Element
>  {
>  	u8					Element_ID;
>  	u8					Length;
> -	SUITE_SELECTOR	OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01
> +	struct suite_selector	OuiWPAAdditional; /* WPA version 2.0 additional field, and should be 00:50:F2:01 */
>  	u16					Version;
> -	SUITE_SELECTOR		GroupKeySuite;
> +	struct suite_selector		GroupKeySuite;
>  	u16					PairwiseKeySuiteCount;
> -	SUITE_SELECTOR		PairwiseKeySuite[1];
> +	struct suite_selector		PairwiseKeySuite[1];
>  }__attribute__ ((packed));
>  struct RSN_Auth_Sub_Information_Element
>  {
>  	u16				AuthKeyMngtSuiteCount;
> -	SUITE_SELECTOR	AuthKeyMngtSuite[1];
> +	struct suite_selector	AuthKeyMngtSuite[1];
>  }__attribute__ ((packed));
>  
>  //--  WPA2  --
> @@ -508,16 +508,16 @@ struct	WPA2_RSN_Information_Element
>  	u8					Element_ID;
>  	u8					Length;
>  	u16					Version;
> -	SUITE_SELECTOR		GroupKeySuite;
> +	struct suite_selector		GroupKeySuite;
>  	u16					PairwiseKeySuiteCount;
> -	SUITE_SELECTOR		PairwiseKeySuite[1];
> +	struct suite_selector		PairwiseKeySuite[1];
>  
>  }__attribute__ ((packed));
>  
>  struct WPA2_RSN_Auth_Sub_Information_Element
>  {
>  	u16				AuthKeyMngtSuiteCount;
> -	SUITE_SELECTOR	AuthKeyMngtSuite[1];
> +	struct suite_selector	AuthKeyMngtSuite[1];
>  }__attribute__ ((packed));
>  
>  

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

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

* Re: [PATCH 4/6] staging: winbond: Remove typedef for standard types
  2010-03-19 20:41       ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Sankar P
  2010-03-19 20:41         ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME to struct Sankar P
@ 2010-03-20  0:16         ` Pavel Machek
  1 sibling, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2010-03-20  0:16 UTC (permalink / raw)
  To: Sankar P; +Cc: gregkh, penberg, devel, linux-kernel

On Sat 2010-03-20 02:11:02, Sankar P wrote:
> Remove the typedef named "fixed" used for the standard type s32
> 
> Signed-off-by: Sankar P <sankar.curiosity@gmail.com>

NAK. That actually makes sense.


> -/****************** LOCAL TYPE DEFINITION SECTION ***************************/
> -typedef s32         fixed; /* 16.16 fixed-point */
> -
> -static const fixed Angles[]=
> +static const s32 Angles[] =

fixed points are very different from integers...

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

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

* Re: [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME to struct
  2010-03-19 20:41         ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME to struct Sankar P
  2010-03-19 20:41           ` [PATCH 6/6] staging: winbond: Convert typedef struct _SCAN_REQ_PARA " Sankar P
@ 2010-03-20  0:17           ` Pavel Machek
  1 sibling, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2010-03-20  0:17 UTC (permalink / raw)
  To: Sankar P; +Cc: gregkh, penberg, devel, linux-kernel

On Sat 2010-03-20 02:11:03, Sankar P wrote:
> This patch converts the typedef struct _MLME_FRAME to
> struct mlme_frame and updates the places where it is used.
> 
> Signed-off-by: Sankar P <sankar.curiosity@gmail.com>

Ack.

> ---
>  drivers/staging/winbond/core.h   |    2 +-
>  drivers/staging/winbond/mlme_s.h |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
> index 0a2060b..372053a 100644
> --- a/drivers/staging/winbond/core.h
> +++ b/drivers/staging/winbond/core.h
> @@ -16,7 +16,7 @@ struct wbsoft_priv {
>  
>  	struct wb_local_para sLocalPara;	// Myself connected parameters
>  
> -	MLME_FRAME sMlmeFrame;	// connect to peerSTA parameters
> +	struct mlme_frame sMlmeFrame;	/* connect to peerSTA parameters */
>  
>  	struct wb35_mto_params sMtoPara;	// MTO_struct ...
>  	struct hw_data sHwData;	//For HAL
> diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
> index 1217a1c..c95debf 100644
> --- a/drivers/staging/winbond/mlme_s.h
> +++ b/drivers/staging/winbond/mlme_s.h
> @@ -131,7 +131,7 @@
>  #define boMLME_IdleScanState(_BB_)	(_BB_->wState==IDLE_SCAN)
>  #define boMLME_FoundSTAinfo(_CC_)	(_CC_->wState>=IDLE_SCAN)
>  
> -typedef struct _MLME_FRAME
> +struct mlme_frame
>  {
>  	//NDIS_PACKET		MLME_Packet;
>  	s8 *			pMMPDU;
> @@ -156,7 +156,7 @@ typedef struct _MLME_FRAME
>  	u16		wNumRxMMPDUInMLME; 	// Number of the Rx MMPDU
>  	u16		reserved_1;			//  in MLME.
>                      	            //  excluding the discarded
> -} MLME_FRAME, *psMLME_FRAME;
> +};
>  
>  typedef struct _AUTHREQ {
>  

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

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

* Re: [PATCH 6/6] staging: winbond: Convert typedef struct _SCAN_REQ_PARA to struct
  2010-03-19 20:41           ` [PATCH 6/6] staging: winbond: Convert typedef struct _SCAN_REQ_PARA " Sankar P
@ 2010-03-20  0:17             ` Pavel Machek
  0 siblings, 0 replies; 15+ messages in thread
From: Pavel Machek @ 2010-03-20  0:17 UTC (permalink / raw)
  To: Sankar P; +Cc: gregkh, penberg, devel, linux-kernel

On Sat 2010-03-20 02:11:04, Sankar P wrote:
> This patch converts typedef struct _SCAN_REQ_PARA to
> struct scan_req_para and the places where it is used.
> 
> Signed-off-by: Sankar P <sankar.curiosity@gmail.com>

ack.

> ---
>  drivers/staging/winbond/scan_s.h |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/winbond/scan_s.h b/drivers/staging/winbond/scan_s.h
> index 209717f..e677fc4 100644
> --- a/drivers/staging/winbond/scan_s.h
> +++ b/drivers/staging/winbond/scan_s.h
> @@ -31,7 +31,9 @@
>  
>  ///////////////////////////////////////////////////////////////////////////
>  //Global data structures, Initial Scan & Background Scan
> -typedef struct _SCAN_REQ_PARA	//mandatory parameters for SCAN request
> +
> +/* Mandatory parameters for SCAN request */
> +struct scan_req_para
>  {
>  	u32				ScanType;			//passive/active scan
>  
> @@ -40,14 +42,14 @@ typedef struct _SCAN_REQ_PARA	//mandatory parameters for SCAN request
>  	struct SSID_Element	sSSID; // 34B. scan only for this SSID
>  	u8			reserved_2[2];
>  
> -} SCAN_REQ_PARA, *psSCAN_REQ_PARA;
> +};
>  
>  typedef struct _SCAN_PARAMETERS
>  {
>  	u16				wState;
>  	u16				iCurrentChannelIndex;
>  
> -	SCAN_REQ_PARA	sScanReq;
> +	struct scan_req_para	sScanReq;
>  
>  	u8				BSSID[MAC_ADDR_LENGTH + 2];		//scan only for this BSSID
>  

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

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

* Re: [PATCH 0/6] staging: winbond: Cleanups
  2010-03-19 20:40 [PATCH 0/6] staging: winbond: Cleanups Sankar P
  2010-03-19 20:40 ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Sankar P
@ 2010-03-21 12:40 ` Pekka Enberg
  2010-04-28 23:12   ` Greg KH
  1 sibling, 1 reply; 15+ messages in thread
From: Pekka Enberg @ 2010-03-21 12:40 UTC (permalink / raw)
  To: Sankar P; +Cc: gregkh, pavel, devel, linux-kernel

Sankar P wrote:
> The following series of patches are cleanups on the winbond driver
> under staging. Some typedefs are converted to structs and
> an un-used enumeration and a typedef are removed. 

Well, there's an identical patch series by me floating around waiting 
for Greg to apply them. But should Greg go with these, they look good to 
me except for the fixed point one for which we have a better patch also 
waiting to be applied.

			Pekka

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

* Re: [PATCH 0/6] staging: winbond: Cleanups
  2010-03-21 12:40 ` [PATCH 0/6] staging: winbond: Cleanups Pekka Enberg
@ 2010-04-28 23:12   ` Greg KH
  0 siblings, 0 replies; 15+ messages in thread
From: Greg KH @ 2010-04-28 23:12 UTC (permalink / raw)
  To: Pekka Enberg; +Cc: Sankar P, gregkh, pavel, devel, linux-kernel

On Sun, Mar 21, 2010 at 02:40:39PM +0200, Pekka Enberg wrote:
> Sankar P wrote:
> >The following series of patches are cleanups on the winbond driver
> >under staging. Some typedefs are converted to structs and
> >an un-used enumeration and a typedef are removed.
> 
> Well, there's an identical patch series by me floating around
> waiting for Greg to apply them. But should Greg go with these, they
> look good to me except for the fixed point one for which we have a
> better patch also waiting to be applied.

I've applied the first 4 of these then.

thanks,

greg k-h

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

end of thread, other threads:[~2010-04-28 23:28 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-19 20:40 [PATCH 0/6] staging: winbond: Cleanups Sankar P
2010-03-19 20:40 ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Sankar P
2010-03-19 20:41   ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Sankar P
2010-03-19 20:41     ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Sankar P
2010-03-19 20:41       ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Sankar P
2010-03-19 20:41         ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME to struct Sankar P
2010-03-19 20:41           ` [PATCH 6/6] staging: winbond: Convert typedef struct _SCAN_REQ_PARA " Sankar P
2010-03-20  0:17             ` Pavel Machek
2010-03-20  0:17           ` [PATCH 5/6] staging: winbond: Convert typedef struct _MLME_FRAME " Pavel Machek
2010-03-20  0:16         ` [PATCH 4/6] staging: winbond: Remove typedef for standard types Pavel Machek
2010-03-20  0:15       ` [PATCH 3/6] staging: winbond: Convert typedef struct _STRUCT_SELECTOR Pavel Machek
2010-03-20  0:14     ` [PATCH 2/6] staging: winbond: Remove unused enum enum_PowerManagementMode Pavel Machek
2010-03-20  0:13   ` [PATCH 1/6] staging: winbond: Convert typedef struct _PMKID to struct pmkid Pavel Machek
2010-03-21 12:40 ` [PATCH 0/6] staging: winbond: Cleanups Pekka Enberg
2010-04-28 23:12   ` Greg KH

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