diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-03-14 13:58:43 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:58:43 -0400 |
commit | e6b5260ee8d2e682ef90caac902124ca884f7386 (patch) | |
tree | f49a469f77f7fd23bf0029ec15103ff68afff011 /drivers/staging | |
parent | 02e12e08f4e94973c3bae9f3f6445680a120bebc (diff) |
ath6kl: remove-typedef HIF_DEVICE_OS_DEVICE_INFO
remove-typedef -s HIF_DEVICE_OS_DEVICE_INFO \
"struct hif_device_os_device_info" 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')
-rw-r--r-- | drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/include/hif.h | 6 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/ar6000_drv.c | 10 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/export_hci_transport.c | 4 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/hci_bridge.c | 2 | ||||
-rw-r--r-- | drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c index 9b947b4934f..6d3b9f49d3b 100644 --- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c +++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | |||
@@ -730,7 +730,7 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode, | |||
730 | break; | 730 | break; |
731 | case HIF_DEVICE_GET_OS_DEVICE: | 731 | case HIF_DEVICE_GET_OS_DEVICE: |
732 | /* pass back a pointer to the SDIO function's "dev" struct */ | 732 | /* pass back a pointer to the SDIO function's "dev" struct */ |
733 | ((HIF_DEVICE_OS_DEVICE_INFO *)config)->pOSDevice = &device->func->dev; | 733 | ((struct hif_device_os_device_info *)config)->pOSDevice = &device->func->dev; |
734 | break; | 734 | break; |
735 | case HIF_DEVICE_POWER_STATE_CHANGE: | 735 | case HIF_DEVICE_POWER_STATE_CHANGE: |
736 | status = PowerStateChangeNotify(device, *(HIF_DEVICE_POWER_CHANGE_TYPE *)config); | 736 | status = PowerStateChangeNotify(device, *(HIF_DEVICE_POWER_CHANGE_TYPE *)config); |
diff --git a/drivers/staging/ath6kl/include/hif.h b/drivers/staging/ath6kl/include/hif.h index 8df01b307f7..2c0f490f253 100644 --- a/drivers/staging/ath6kl/include/hif.h +++ b/drivers/staging/ath6kl/include/hif.h | |||
@@ -211,7 +211,7 @@ typedef enum { | |||
211 | * | 211 | * |
212 | * HIF_DEVICE_GET_OS_DEVICE | 212 | * HIF_DEVICE_GET_OS_DEVICE |
213 | * intput : none | 213 | * intput : none |
214 | * output : HIF_DEVICE_OS_DEVICE_INFO; | 214 | * output : struct hif_device_os_device_info; |
215 | * note: On some operating systems, the HIF layer has a parent device object for the bus. This object | 215 | * note: On some operating systems, the HIF layer has a parent device object for the bus. This object |
216 | * may be required to register certain types of logical devices. | 216 | * may be required to register certain types of logical devices. |
217 | * | 217 | * |
@@ -315,9 +315,9 @@ typedef struct _HIF_DEVICE_SCATTER_SUPPORT_INFO { | |||
315 | int MaxTransferSizePerScatterReq; | 315 | int MaxTransferSizePerScatterReq; |
316 | } HIF_DEVICE_SCATTER_SUPPORT_INFO; | 316 | } HIF_DEVICE_SCATTER_SUPPORT_INFO; |
317 | 317 | ||
318 | typedef struct { | 318 | struct hif_device_os_device_info { |
319 | void *pOSDevice; | 319 | void *pOSDevice; |
320 | } HIF_DEVICE_OS_DEVICE_INFO; | 320 | }; |
321 | 321 | ||
322 | #define HIF_MAX_DEVICES 1 | 322 | #define HIF_MAX_DEVICES 1 |
323 | 323 | ||
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c index 749e28422f7..b739943d0ab 100644 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c | |||
@@ -803,7 +803,7 @@ ar6000_sysfs_bmi_read(struct file *fp, struct kobject *kobj, | |||
803 | { | 803 | { |
804 | int index; | 804 | int index; |
805 | AR_SOFTC_T *ar; | 805 | AR_SOFTC_T *ar; |
806 | HIF_DEVICE_OS_DEVICE_INFO *osDevInfo; | 806 | struct hif_device_os_device_info *osDevInfo; |
807 | 807 | ||
808 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Read %d bytes\n", (u32)count)); | 808 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Read %d bytes\n", (u32)count)); |
809 | for (index=0; index < MAX_AR6000; index++) { | 809 | for (index=0; index < MAX_AR6000; index++) { |
@@ -830,7 +830,7 @@ ar6000_sysfs_bmi_write(struct file *fp, struct kobject *kobj, | |||
830 | { | 830 | { |
831 | int index; | 831 | int index; |
832 | AR_SOFTC_T *ar; | 832 | AR_SOFTC_T *ar; |
833 | HIF_DEVICE_OS_DEVICE_INFO *osDevInfo; | 833 | struct hif_device_os_device_info *osDevInfo; |
834 | 834 | ||
835 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Write %d bytes\n", (u32)count)); | 835 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Write %d bytes\n", (u32)count)); |
836 | for (index=0; index < MAX_AR6000; index++) { | 836 | for (index=0; index < MAX_AR6000; index++) { |
@@ -856,13 +856,13 @@ ar6000_sysfs_bmi_init(AR_SOFTC_T *ar) | |||
856 | int status; | 856 | int status; |
857 | 857 | ||
858 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Creating sysfs entry\n")); | 858 | AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Creating sysfs entry\n")); |
859 | A_MEMZERO(&ar->osDevInfo, sizeof(HIF_DEVICE_OS_DEVICE_INFO)); | 859 | A_MEMZERO(&ar->osDevInfo, sizeof(struct hif_device_os_device_info)); |
860 | 860 | ||
861 | /* Get the underlying OS device */ | 861 | /* Get the underlying OS device */ |
862 | status = HIFConfigureDevice(ar->arHifDevice, | 862 | status = HIFConfigureDevice(ar->arHifDevice, |
863 | HIF_DEVICE_GET_OS_DEVICE, | 863 | HIF_DEVICE_GET_OS_DEVICE, |
864 | &ar->osDevInfo, | 864 | &ar->osDevInfo, |
865 | sizeof(HIF_DEVICE_OS_DEVICE_INFO)); | 865 | sizeof(struct hif_device_os_device_info)); |
866 | 866 | ||
867 | if (status) { | 867 | if (status) { |
868 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI: Failed to get OS device info from HIF\n")); | 868 | AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI: Failed to get OS device info from HIF\n")); |
@@ -1604,7 +1604,7 @@ ar6000_avail_ev(void *context, void *hif_handle) | |||
1604 | struct wireless_dev *wdev; | 1604 | struct wireless_dev *wdev; |
1605 | #endif /* ATH6K_CONFIG_CFG80211 */ | 1605 | #endif /* ATH6K_CONFIG_CFG80211 */ |
1606 | int init_status = 0; | 1606 | int init_status = 0; |
1607 | HIF_DEVICE_OS_DEVICE_INFO osDevInfo; | 1607 | struct hif_device_os_device_info osDevInfo; |
1608 | 1608 | ||
1609 | memset(&osDevInfo, 0, sizeof(osDevInfo)); | 1609 | memset(&osDevInfo, 0, sizeof(osDevInfo)); |
1610 | if (HIFConfigureDevice(hif_handle, HIF_DEVICE_GET_OS_DEVICE, | 1610 | if (HIFConfigureDevice(hif_handle, HIF_DEVICE_GET_OS_DEVICE, |
diff --git a/drivers/staging/ath6kl/os/linux/export_hci_transport.c b/drivers/staging/ath6kl/os/linux/export_hci_transport.c index fd875263f27..79b30ebab79 100644 --- a/drivers/staging/ath6kl/os/linux/export_hci_transport.c +++ b/drivers/staging/ath6kl/os/linux/export_hci_transport.c | |||
@@ -76,8 +76,8 @@ ar6000_get_hif_dev(HIF_DEVICE *device, void *config) | |||
76 | 76 | ||
77 | status = HIFConfigureDevice(device, | 77 | status = HIFConfigureDevice(device, |
78 | HIF_DEVICE_GET_OS_DEVICE, | 78 | HIF_DEVICE_GET_OS_DEVICE, |
79 | (HIF_DEVICE_OS_DEVICE_INFO *)config, | 79 | (struct hif_device_os_device_info *)config, |
80 | sizeof(HIF_DEVICE_OS_DEVICE_INFO)); | 80 | sizeof(struct hif_device_os_device_info)); |
81 | return status; | 81 | return status; |
82 | } | 82 | } |
83 | 83 | ||
diff --git a/drivers/staging/ath6kl/os/linux/hci_bridge.c b/drivers/staging/ath6kl/os/linux/hci_bridge.c index 4500f84b560..d30ca24a1d5 100644 --- a/drivers/staging/ath6kl/os/linux/hci_bridge.c +++ b/drivers/staging/ath6kl/os/linux/hci_bridge.c | |||
@@ -857,7 +857,7 @@ static int bt_setup_hci(struct ar6k_hci_bridge_info *pHcidevInfo) | |||
857 | { | 857 | { |
858 | int status = 0; | 858 | int status = 0; |
859 | struct hci_dev *pHciDev = NULL; | 859 | struct hci_dev *pHciDev = NULL; |
860 | HIF_DEVICE_OS_DEVICE_INFO osDevInfo; | 860 | struct hif_device_os_device_info osDevInfo; |
861 | 861 | ||
862 | if (!setupbtdev) { | 862 | if (!setupbtdev) { |
863 | return 0; | 863 | return 0; |
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h index 2373ed55e57..a2091338030 100644 --- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h +++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h | |||
@@ -596,7 +596,7 @@ typedef struct ar6_softc { | |||
596 | WMI_BTCOEX_CONFIG_EVENT arBtcoexConfig; | 596 | WMI_BTCOEX_CONFIG_EVENT arBtcoexConfig; |
597 | WMI_BTCOEX_STATS_EVENT arBtcoexStats; | 597 | WMI_BTCOEX_STATS_EVENT arBtcoexStats; |
598 | s32 (*exitCallback)(void *config); /* generic callback at AR6K exit */ | 598 | s32 (*exitCallback)(void *config); /* generic callback at AR6K exit */ |
599 | HIF_DEVICE_OS_DEVICE_INFO osDevInfo; | 599 | struct hif_device_os_device_info osDevInfo; |
600 | #ifdef ATH6K_CONFIG_CFG80211 | 600 | #ifdef ATH6K_CONFIG_CFG80211 |
601 | struct wireless_dev *wdev; | 601 | struct wireless_dev *wdev; |
602 | struct cfg80211_scan_request *scan_request; | 602 | struct cfg80211_scan_request *scan_request; |