remove-typedef -s HCI_TRANSPORT_CALLBACKS \
"struct hci_transport_callbacks" drivers/staging/ath6kl/
Tested-by: Naveen Singh <[email protected]>
Signed-off-by: Luis R. Rodriguez <[email protected]>
---
drivers/staging/ath6kl/include/common_drv.h | 4 ++--
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6k_pal.c | 4 ++--
.../staging/ath6kl/os/linux/export_hci_transport.c | 4 ++--
drivers/staging/ath6kl/os/linux/hci_bridge.c | 2 +-
.../ath6kl/os/linux/include/export_hci_transport.h | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/ath6kl/include/common_drv.h
b/drivers/staging/ath6kl/include/common_drv.h
index f5bc9c3..2b633d9 100644
--- a/drivers/staging/ath6kl/include/common_drv.h
+++ b/drivers/staging/ath6kl/include/common_drv.h
@@ -36,10 +36,10 @@ struct common_credit_state_info {
HTC_ENDPOINT_CREDIT_DIST *pLowestPriEpDist; /* pointer to the lowest
priority endpoint dist struct */
};
-typedef struct {
+struct hci_transport_callbacks {
s32 (*setupTransport)(void *ar);
void (*cleanupTransport)(void *ar);
-} HCI_TRANSPORT_CALLBACKS;
+};
typedef struct {
void *netDevice;
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 811235a..add1ceb 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -114,7 +114,7 @@ APTC_TRAFFIC_RECORD aptcTR;
#ifdef EXPORT_HCI_BRIDGE_INTERFACE
// callbacks registered by HCI transport driver
-HCI_TRANSPORT_CALLBACKS ar6kHciTransCallbacks = { NULL };
+struct hci_transport_callbacks ar6kHciTransCallbacks = { NULL };
#endif
unsigned int processDot11Hdr = 0;
diff --git a/drivers/staging/ath6kl/os/linux/ar6k_pal.c
b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
index 8dd51ee..08f3710 100644
--- a/drivers/staging/ath6kl/os/linux/ar6k_pal.c
+++ b/drivers/staging/ath6kl/os/linux/ar6k_pal.c
@@ -455,10 +455,10 @@ void ar6k_cleanup_hci_pal(void *ar_p)
* Register init and callback function with ar6k
* when PAL driver is a separate kernel module.
****************************************************/
-int ar6k_register_hci_pal(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks);
+int ar6k_register_hci_pal(struct hci_transport_callbacks *hciTransCallbacks);
static int __init pal_init_module(void)
{
- HCI_TRANSPORT_CALLBACKS hciTransCallbacks;
+ struct hci_transport_callbacks hciTransCallbacks;
hciTransCallbacks.setupTransport = ar6k_setup_hci_pal;
hciTransCallbacks.cleanupTransport = ar6k_cleanup_hci_pal;
diff --git a/drivers/staging/ath6kl/os/linux/export_hci_transport.c
b/drivers/staging/ath6kl/os/linux/export_hci_transport.c
index 9e8ca5c..168d6f7 100644
--- a/drivers/staging/ath6kl/os/linux/export_hci_transport.c
+++ b/drivers/staging/ath6kl/os/linux/export_hci_transport.c
@@ -49,9 +49,9 @@ int (*_HCI_TransportRecvHCIEventSync)(HCI_TRANSPORT_HANDLE
HciTrans,
int (*_HCI_TransportSetBaudRate)(HCI_TRANSPORT_HANDLE HciTrans, u32 Baud);
int (*_HCI_TransportEnablePowerMgmt)(HCI_TRANSPORT_HANDLE HciTrans, bool
Enable);
-extern HCI_TRANSPORT_CALLBACKS ar6kHciTransCallbacks;
+extern struct hci_transport_callbacks ar6kHciTransCallbacks;
-int ar6000_register_hci_transport(HCI_TRANSPORT_CALLBACKS *hciTransCallbacks)
+int ar6000_register_hci_transport(struct hci_transport_callbacks
*hciTransCallbacks)
{
ar6kHciTransCallbacks = *hciTransCallbacks;
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c
b/drivers/staging/ath6kl/os/linux/hci_bridge.c
index 327aab6..61ce094 100644
--- a/drivers/staging/ath6kl/os/linux/hci_bridge.c
+++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c
@@ -1119,7 +1119,7 @@ static int __init
hcibridge_init_module(void)
{
int status;
- HCI_TRANSPORT_CALLBACKS hciTransCallbacks;
+ struct hci_transport_callbacks hciTransCallbacks;
hciTransCallbacks.setupTransport = ar6000_setup_hci;
hciTransCallbacks.cleanupTransport = ar6000_cleanup_hci;
diff --git a/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
b/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
index 63d887c..51187f6 100644
--- a/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
+++ b/drivers/staging/ath6kl/os/linux/include/export_hci_transport.h
@@ -61,7 +61,7 @@ extern int
(*_HCI_TransportEnablePowerMgmt)(HCI_TRANSPORT_HANDLE HciTrans, bo
_HCI_TransportEnablePowerMgmt((HciTrans), (Enable))
-extern int ar6000_register_hci_transport(HCI_TRANSPORT_CALLBACKS
*hciTransCallbacks);
+extern int ar6000_register_hci_transport(struct hci_transport_callbacks
*hciTransCallbacks);
extern int ar6000_get_hif_dev(HIF_DEVICE *device, void *config);
--
1.7.4.15.g7811d
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
