diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-03-14 13:58:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:58:41 -0400 |
commit | e83750e79169e860aa1eb9077084e67b7ce5d86b (patch) | |
tree | a7738ca1b82366cda8b3f866ad432318630e478b /drivers/staging/ath6kl | |
parent | c9478eaf5e78c6379fab320eac98f9a878efd579 (diff) |
ath6kl: remove-typedef HCI_TRANSPORT_MISC_HANDLES
remove-typedef -s HCI_TRANSPORT_MISC_HANDLES \
"struct hci_transport_misc_handles" drivers/staging/ath6kl/
Tested-by: Naveen Singh <nsingh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ath6kl')
-rw-r--r-- | drivers/staging/ath6kl/include/common_drv.h | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/hci_bridge.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/ath6kl/include/common_drv.h b/drivers/staging/ath6kl/include/common_drv.h index 2b633d92064..4c70a779e1f 100644 --- a/drivers/staging/ath6kl/include/common_drv.h +++ b/drivers/staging/ath6kl/include/common_drv.h | |||
@@ -41,11 +41,11 @@ struct hci_transport_callbacks { | |||
41 | void (*cleanupTransport)(void *ar); | 41 | void (*cleanupTransport)(void *ar); |
42 | }; | 42 | }; |
43 | 43 | ||
44 | typedef struct { | 44 | struct hci_transport_misc_handles { |
45 | void *netDevice; | 45 | void *netDevice; |
46 | void *hifDevice; | 46 | void *hifDevice; |
47 | void *htcHandle; | 47 | void *htcHandle; |
48 | } HCI_TRANSPORT_MISC_HANDLES; | 48 | }; |
49 | 49 | ||
50 | /* HTC TX packet tagging definitions */ | 50 | /* HTC TX packet tagging definitions */ |
51 | #define AR6K_CONTROL_PKT_TAG HTC_TX_PACKET_TAG_USER_DEFINED | 51 | #define AR6K_CONTROL_PKT_TAG HTC_TX_PACKET_TAG_USER_DEFINED |
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index add1cebaee5..749e28422f7 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -2723,7 +2723,7 @@ int ar6000_init(struct net_device *dev) | |||
2723 | 2723 | ||
2724 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 2724 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
2725 | if (setuphci && (NULL != ar6kHciTransCallbacks.setupTransport)) { | 2725 | if (setuphci && (NULL != ar6kHciTransCallbacks.setupTransport)) { |
2726 | HCI_TRANSPORT_MISC_HANDLES hciHandles; | 2726 | struct hci_transport_misc_handles hciHandles; |
2727 | 2727 | ||
2728 | hciHandles.netDevice = ar->arNetDev; | 2728 | hciHandles.netDevice = ar->arNetDev; |
2729 | hciHandles.hifDevice = ar->arHifDevice; | 2729 | hciHandles.hifDevice = ar->arHifDevice; |
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c index d0b68144359..433c69eb739 100644 --- a/drivers/staging/ath6kl/os/linux/hci_bridge.c +++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c | |||
@@ -83,7 +83,7 @@ struct ar6k_hci_bridge_info { | |||
83 | u8 *pHTCStructAlloc; | 83 | u8 *pHTCStructAlloc; |
84 | spinlock_t BridgeLock; | 84 | spinlock_t BridgeLock; |
85 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 85 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
86 | HCI_TRANSPORT_MISC_HANDLES HCITransHdl; | 86 | struct hci_transport_misc_handles HCITransHdl; |
87 | #else | 87 | #else |
88 | AR_SOFTC_T *ar; | 88 | AR_SOFTC_T *ar; |
89 | #endif /* EXPORT_HCI_BRIDGE_INTERFACE */ | 89 | #endif /* EXPORT_HCI_BRIDGE_INTERFACE */ |
@@ -488,7 +488,7 @@ int ar6000_setup_hci(AR_SOFTC_T *ar) | |||
488 | A_MEMZERO(pHcidevInfo, sizeof(struct ar6k_hci_bridge_info)); | 488 | A_MEMZERO(pHcidevInfo, sizeof(struct ar6k_hci_bridge_info)); |
489 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE | 489 | #ifdef EXPORT_HCI_BRIDGE_INTERFACE |
490 | g_pHcidevInfo = pHcidevInfo; | 490 | g_pHcidevInfo = pHcidevInfo; |
491 | pHcidevInfo->HCITransHdl = *(HCI_TRANSPORT_MISC_HANDLES *)ar; | 491 | pHcidevInfo->HCITransHdl = *(struct hci_transport_misc_handles *)ar; |
492 | #else | 492 | #else |
493 | ar->hcidev_info = pHcidevInfo; | 493 | ar->hcidev_info = pHcidevInfo; |
494 | pHcidevInfo->ar = ar; | 494 | pHcidevInfo->ar = ar; |