Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a541306e authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman
Browse files

ath6kl: remove-typedef PSCmdPacket 



remove-typedef -s PSCmdPacket \
	"struct ps_cmd_packet" drivers/staging/ath6kl/

Tested-by: default avatarNaveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 62860859

drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
 */

typedef struct {



    PSCmdPacket *HciCmdList;

    struct ps_cmd_packet *HciCmdList;

    u32 num_packets;

    struct ar3k_config_info *dev;

}HciCommandListParam;
@@ -133,7 +133,7 @@ int PSSendOps(void *arg) 
{

    int i;

    int status = 0;

    PSCmdPacket *HciCmdList; /* List storing the commands */

    struct ps_cmd_packet *HciCmdList; /* List storing the commands */

    const struct firmware* firmware;

    u32 numCmds;

    u8 *event;

drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c

+6 −6
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ tRamPatch RamPatch[MAX_NUM_PATCH_ENTRY]; 
int AthParseFilesUnified(u8 *srcbuffer,u32 srclen, int FileFormat);

char AthReadChar(u8 *buffer, u32 len,u32 *pos);

char *AthGetLine(char *buffer, int maxlen, u8 *srcbuffer,u32 len,u32 *pos);

static int AthPSCreateHCICommand(u8 Opcode, u32 Param1,PSCmdPacket *PSPatchPacket,u32 *index);

static int AthPSCreateHCICommand(u8 Opcode, u32 Param1,struct ps_cmd_packet *PSPatchPacket,u32 *index);



/* Function to reads the next character from the input buffer */

char AthReadChar(u8 *buffer, u32 len,u32 *pos)
@@ -764,7 +764,7 @@ static void LoadHeader(u8 *HCI_PS_Command,u8 opcode,int length,int index){ 


/////////////////////////

//

int AthCreateCommandList(PSCmdPacket **HciPacketList, u32 *numPackets)

int AthCreateCommandList(struct ps_cmd_packet **HciPacketList, u32 *numPackets)

{



    u8 count;
@@ -785,8 +785,8 @@ int AthCreateCommandList(PSCmdPacket **HciPacketList, u32 *numPackets) 
        if(Patch_Count > 0) {

            NumcmdEntry++; /* Patch Enable Command */

        }

           AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Num Cmd Entries %d Size  %d  \r\n",NumcmdEntry,(u32)sizeof(PSCmdPacket) * NumcmdEntry));

        (*HciPacketList) = A_MALLOC(sizeof(PSCmdPacket) * NumcmdEntry);

           AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Num Cmd Entries %d Size  %d  \r\n",NumcmdEntry,(u32)sizeof(struct ps_cmd_packet) * NumcmdEntry));

        (*HciPacketList) = A_MALLOC(sizeof(struct ps_cmd_packet) * NumcmdEntry);

    if(NULL == *HciPacketList) {

               AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("memory allocation failed  \r\n"));

        }
@@ -833,7 +833,7 @@ int AthCreateCommandList(PSCmdPacket **HciPacketList, u32 *numPackets) 
////////////////////////



/////////////

static int AthPSCreateHCICommand(u8 Opcode, u32 Param1,PSCmdPacket *PSPatchPacket,u32 *index)

static int AthPSCreateHCICommand(u8 Opcode, u32 Param1,struct ps_cmd_packet *PSPatchPacket,u32 *index)

{

    u8 *HCI_PS_Command;

    u32 Length;
@@ -955,7 +955,7 @@ static int AthPSCreateHCICommand(u8 Opcode, u32 Param1,PSCmdPacket *PSPatchPacke 
    }

    return 0;

}

int AthFreeCommandList(PSCmdPacket **HciPacketList, u32 numPackets)

int AthFreeCommandList(struct ps_cmd_packet **HciPacketList, u32 numPackets)

{

    int i;

    if(*HciPacketList == NULL) {

drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h

+4 −4
Original line number Diff line number Diff line
@@ -89,11 +89,11 @@ 






typedef struct PSCmdPacket

struct ps_cmd_packet

{

    u8 *Hcipacket;

    int packetLen;

} PSCmdPacket;

};



/* Parses a Patch information buffer and store it in global structure */

int AthDoParsePatch(u8 *, u32 );
@@ -112,8 +112,8 @@ int AthDoParsePS(u8 *, u32 ); 
 *  PS Tag Command(s)

 *

 */  

int AthCreateCommandList(PSCmdPacket **, u32 *);

int AthCreateCommandList(struct ps_cmd_packet **, u32 *);



/* Cleanup the dynamically allicated HCI command list */

int AthFreeCommandList(PSCmdPacket **HciPacketList, u32 numPackets);

int AthFreeCommandList(struct ps_cmd_packet **HciPacketList, u32 numPackets);

#endif /* __AR3KPSPARSER_H */