staging: rtl8192e: Convert typedef SwChnlCmd to struct sw_chnl_cmd

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/r8192E_phy.c
index 22ab563521564c913c4ba408f4bb2c79f97521d1..517eab38b96b061467f9c31214b2a034a26df944 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/r8192E_phy.c
@@ -824,7 +824,7 @@ void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)
        return;
 }
 u8 rtl8192_phy_SetSwChnlCmdArray(
-       SwChnlCmd*              CmdTable,
+       struct sw_chnl_cmd*             CmdTable,
        u32                     CmdTableIdx,
        u32                     CmdTableSz,
        SwChnlCmdID             CmdID,
@@ -833,7 +833,7 @@ u8 rtl8192_phy_SetSwChnlCmdArray(
        u32                     msDelay
        )
 {
-       SwChnlCmd* pCmd;
+       struct sw_chnl_cmd* pCmd;
 
        if (CmdTable == NULL)
        {
@@ -858,13 +858,13 @@ u8 rtl8192_phy_SetSwChnlCmdArray(
 u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u8* step, u32* delay)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       SwChnlCmd                               PreCommonCmd[MAX_PRECMD_CNT];
+       struct sw_chnl_cmd PreCommonCmd[MAX_PRECMD_CNT];
        u32                                     PreCommonCmdCnt;
-       SwChnlCmd                               PostCommonCmd[MAX_POSTCMD_CNT];
+       struct sw_chnl_cmd PostCommonCmd[MAX_POSTCMD_CNT];
        u32                                     PostCommonCmdCnt;
-       SwChnlCmd                               RfDependCmd[MAX_RFDEPENDCMD_CNT];
+       struct sw_chnl_cmd RfDependCmd[MAX_RFDEPENDCMD_CNT];
        u32                                     RfDependCmdCnt;
-       SwChnlCmd                               *CurrentCmd = NULL;
+       struct sw_chnl_cmd *CurrentCmd = NULL;
        u8              eRFPath;
 
        RT_TRACE(COMP_TRACE, "====>%s()====stage:%d, step:%d, channel:%d\n", __func__, *stage, *step, channel);

diff --git a/drivers/staging/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/r8192E_phy.h
index d6020c0f98fdab278cf51471a91310d36424ca41..8a9b491408509c1161f9dd7143aba592b865ef4f 100644 (file)
--- a/drivers/staging/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/r8192E_phy.h
@@ -58,12 +58,12 @@ typedef enum _SwChnlCmdID {
 } SwChnlCmdID;
 
 /*--------------------------------Define structure--------------------------------*/
-typedef struct _SwChnlCmd {
+struct sw_chnl_cmd {
        SwChnlCmdID     CmdID;
        u32                     Para1;
        u32                     Para2;
        u32                     msDelay;
-} __attribute__ ((packed)) SwChnlCmd;
+} __packed;
 
 extern u32 rtl819XMACPHY_Array_PG[];
 extern u32 rtl819XPHY_REG_1T2RArray[];