aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2011-03-14 13:58:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 14:58:43 -0400
commit031a71c77427904367583762b91470bbf161b78c (patch)
tree460bce6f9e0da326eabf7a658dd258cbff31c12f /drivers/staging
parente6b5260ee8d2e682ef90caac902124ca884f7386 (diff)
ath6kl: remove-typedef HIF_DEVICE_SCATTER_SUPPORT_INFO
remove-typedef -s HIF_DEVICE_SCATTER_SUPPORT_INFO \ "struct hif_device_scatter_support_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/include/hif_internal.h4
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c2
-rw-r--r--drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c2
-rw-r--r--drivers/staging/ath6kl/htc2/AR6000/ar6k.h2
-rw-r--r--drivers/staging/ath6kl/include/hif.h6
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
index b5d1ad430ff..e2d2266ba32 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/include/hif_internal.h
@@ -110,13 +110,13 @@ typedef struct _HIF_SCATTER_REQ_PRIV {
110 110
111#define ATH_DEBUG_SCATTER ATH_DEBUG_MAKE_MODULE_MASK(0) 111#define ATH_DEBUG_SCATTER ATH_DEBUG_MAKE_MODULE_MASK(0)
112 112
113int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo); 113int SetupHIFScatterSupport(HIF_DEVICE *device, struct hif_device_scatter_support_info *pInfo);
114void CleanupHIFScatterResources(HIF_DEVICE *device); 114void CleanupHIFScatterResources(HIF_DEVICE *device);
115int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest); 115int DoHifReadWriteScatter(HIF_DEVICE *device, BUS_REQUEST *busrequest);
116 116
117#else // HIF_LINUX_MMC_SCATTER_SUPPORT 117#else // HIF_LINUX_MMC_SCATTER_SUPPORT
118 118
119static inline int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) 119static inline int SetupHIFScatterSupport(HIF_DEVICE *device, struct hif_device_scatter_support_info *pInfo)
120{ 120{
121 return A_ENOTSUP; 121 return A_ENOTSUP;
122} 122}
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 6d3b9f49d3b..9c9fb1ef86d 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif.c
@@ -723,7 +723,7 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
723 if (!device->scatter_enabled) { 723 if (!device->scatter_enabled) {
724 return A_ENOTSUP; 724 return A_ENOTSUP;
725 } 725 }
726 status = SetupHIFScatterSupport(device, (HIF_DEVICE_SCATTER_SUPPORT_INFO *)config); 726 status = SetupHIFScatterSupport(device, (struct hif_device_scatter_support_info *)config);
727 if (status) { 727 if (status) {
728 device->scatter_enabled = false; 728 device->scatter_enabled = false;
729 } 729 }
diff --git a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
index 2a56a50bc21..567993f7d4e 100644
--- a/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
+++ b/drivers/staging/ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c
@@ -275,7 +275,7 @@ static int HifReadWriteScatter(HIF_DEVICE *device, HIF_SCATTER_REQ *pReq)
275} 275}
276 276
277 /* setup of HIF scatter resources */ 277 /* setup of HIF scatter resources */
278int SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_INFO *pInfo) 278int SetupHIFScatterSupport(HIF_DEVICE *device, struct hif_device_scatter_support_info *pInfo)
279{ 279{
280 int status = A_ERROR; 280 int status = A_ERROR;
281 int i; 281 int i;
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index 85c59157736..08e9ef294ac 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -132,7 +132,7 @@ struct ar6k_device {
132 struct hif_device_irq_yield_params HifIRQYieldParams; 132 struct hif_device_irq_yield_params HifIRQYieldParams;
133 bool DSRCanYield; 133 bool DSRCanYield;
134 int CurrentDSRRecvCount; 134 int CurrentDSRRecvCount;
135 HIF_DEVICE_SCATTER_SUPPORT_INFO HifScatterInfo; 135 struct hif_device_scatter_support_info HifScatterInfo;
136 struct dl_list ScatterReqHead; 136 struct dl_list ScatterReqHead;
137 bool ScatterIsVirtual; 137 bool ScatterIsVirtual;
138 int MaxRecvBundleSize; 138 int MaxRecvBundleSize;
diff --git a/drivers/staging/ath6kl/include/hif.h b/drivers/staging/ath6kl/include/hif.h
index 2c0f490f253..61e4392a991 100644
--- a/drivers/staging/ath6kl/include/hif.h
+++ b/drivers/staging/ath6kl/include/hif.h
@@ -203,7 +203,7 @@ typedef enum {
203 * 203 *
204 * HIF_CONFIGURE_QUERY_SCATTER_REQUEST_SUPPORT 204 * HIF_CONFIGURE_QUERY_SCATTER_REQUEST_SUPPORT
205 * input : none 205 * input : none
206 * output : HIF_DEVICE_SCATTER_SUPPORT_INFO 206 * output : struct hif_device_scatter_support_info
207 * note: This query checks if the HIF layer implements the SCATTER request interface. Scatter requests 207 * note: This query checks if the HIF layer implements the SCATTER request interface. Scatter requests
208 * allows upper layers to submit mailbox I/O operations using a list of buffers. This is useful for 208 * allows upper layers to submit mailbox I/O operations using a list of buffers. This is useful for
209 * multi-message transfers that can better utilize the bus interconnect. 209 * multi-message transfers that can better utilize the bus interconnect.
@@ -306,14 +306,14 @@ typedef HIF_SCATTER_REQ * ( *HIF_ALLOCATE_SCATTER_REQUEST)(HIF_DEVICE *device);
306typedef void ( *HIF_FREE_SCATTER_REQUEST)(HIF_DEVICE *device, HIF_SCATTER_REQ *request); 306typedef void ( *HIF_FREE_SCATTER_REQUEST)(HIF_DEVICE *device, HIF_SCATTER_REQ *request);
307typedef int ( *HIF_READWRITE_SCATTER)(HIF_DEVICE *device, HIF_SCATTER_REQ *request); 307typedef int ( *HIF_READWRITE_SCATTER)(HIF_DEVICE *device, HIF_SCATTER_REQ *request);
308 308
309typedef struct _HIF_DEVICE_SCATTER_SUPPORT_INFO { 309struct hif_device_scatter_support_info {
310 /* information returned from HIF layer */ 310 /* information returned from HIF layer */
311 HIF_ALLOCATE_SCATTER_REQUEST pAllocateReqFunc; 311 HIF_ALLOCATE_SCATTER_REQUEST pAllocateReqFunc;
312 HIF_FREE_SCATTER_REQUEST pFreeReqFunc; 312 HIF_FREE_SCATTER_REQUEST pFreeReqFunc;
313 HIF_READWRITE_SCATTER pReadWriteScatterFunc; 313 HIF_READWRITE_SCATTER pReadWriteScatterFunc;
314 int MaxScatterEntries; 314 int MaxScatterEntries;
315 int MaxTransferSizePerScatterReq; 315 int MaxTransferSizePerScatterReq;
316} HIF_DEVICE_SCATTER_SUPPORT_INFO; 316};
317 317
318struct hif_device_os_device_info { 318struct hif_device_os_device_info {
319 void *pOSDevice; 319 void *pOSDevice;