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

ath6kl: remove-typedef HCI_TRANSPORT_PROPERTIES 



remove-typedef -s HCI_TRANSPORT_PROPERTIES \
	"struct hci_transport_properties" 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 e83750e7

drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c

+1 −1
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ void GMboxProtocolUninstall(struct ar6k_device *pDev) 


static int NotifyTransportReady(struct gmbox_proto_hci_uart  *pProt)

{

    HCI_TRANSPORT_PROPERTIES props;

    struct hci_transport_properties props;

    int                 status = 0;

    

    do {

drivers/staging/ath6kl/include/ar3kconfig.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern "C" { 
struct ar3k_config_info {

    u32 Flags;           /* config flags */

    void                     *pHCIDev;        /* HCI bridge device     */

    HCI_TRANSPORT_PROPERTIES *pHCIProps;      /* HCI bridge props      */

    struct hci_transport_properties *pHCIProps;      /* HCI bridge props      */

    HIF_DEVICE               *pHIFDevice;     /* HIF layer device      */

    

    u32 AR3KBaudRate;    /* AR3K operational baud rate */

drivers/staging/ath6kl/include/hci_transport_api.h

+3 −3
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ typedef enum _HCI_SEND_FULL_ACTION { 
 * the callback must return the send full action to take (either DROP or KEEP) */

typedef HCI_SEND_FULL_ACTION  (*HCI_TRANSPORT_SEND_FULL)(void *, HTC_PACKET *);



typedef struct {

struct hci_transport_properties {

    int    HeadRoom;      /* number of bytes in front of HCI packet for header space */

    int    TailRoom;      /* number of bytes at the end of the HCI packet for tail space */

    int    IOBlockPad;    /* I/O block padding required (always a power of 2) */

} HCI_TRANSPORT_PROPERTIES;

};



struct hci_transport_config_info {

    int      ACLRecvBufferWaterMark;     /* low watermark to trigger recv refill */
@@ -91,7 +91,7 @@ struct hci_transport_config_info { 
    int      MaxSendQueueDepth;          /* max number of packets in the single send queue */

    void     *pContext;                  /* context for all callbacks */

    void     (*TransportFailure)(void *pContext, int Status); /* transport failure callback */

    int (*TransportReady)(HCI_TRANSPORT_HANDLE, HCI_TRANSPORT_PROPERTIES *,void *pContext); /* transport is ready */

    int (*TransportReady)(HCI_TRANSPORT_HANDLE, struct hci_transport_properties *,void *pContext); /* transport is ready */

    void     (*TransportRemoved)(void *pContext);                  /* transport was removed */

        /* packet processing callbacks */

    HCI_TRANSPORT_SEND_PKT_COMPLETE    pHCISendComplete;

drivers/staging/ath6kl/os/linux/hci_bridge.c

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ extern unsigned int hciuartstep; 


struct ar6k_hci_bridge_info {

    void                    *pHCIDev;          /* HCI bridge device */

    HCI_TRANSPORT_PROPERTIES HCIProps;         /* HCI bridge props */

    struct hci_transport_properties HCIProps;         /* HCI bridge props */

    struct hci_dev          *pBtStackHCIDev;   /* BT Stack HCI dev */

    bool                  HciNormalMode;     /* Actual HCI mode enabled (non-TEST)*/

    bool                  HciRegistered;     /* HCI device registered with stack */
@@ -216,7 +216,7 @@ static void RefillRecvBuffers(struct ar6k_hci_bridge_info *pHcidevInfo, 
        (((ar)->arTargetType == TARGET_TYPE_AR6002) ? AR6002_HOST_INTEREST_ITEM_ADDRESS(item) : \

        (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))

static int ar6000_hci_transport_ready(HCI_TRANSPORT_HANDLE     HCIHandle,

                                           HCI_TRANSPORT_PROPERTIES *pProps, 

                                           struct hci_transport_properties *pProps, 

                                           void                     *pContext)

{

    struct ar6k_hci_bridge_info *pHcidevInfo = (struct ar6k_hci_bridge_info *)pContext;