staging: ath6kl: remove-typedef DEV_SCATTER_DMA_VIRTUAL_INFO
remove-typedef -s DEV_SCATTER_DMA_VIRTUAL_INFO \
"struct dev_scatter_dma_virtual_info" drivers/staging/ath6kl/
Cc: Naveen Singh <naveen.singh@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
index 2797b55..a41ed12 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.c
@@ -585,7 +585,7 @@
}
-#define DEV_GET_VIRT_DMA_INFO(p) ((DEV_SCATTER_DMA_VIRTUAL_INFO *)((p)->HIFPrivate[0]))
+#define DEV_GET_VIRT_DMA_INFO(p) ((struct dev_scatter_dma_virtual_info *)((p)->HIFPrivate[0]))
static HIF_SCATTER_REQ *DevAllocScatterReq(HIF_DEVICE *Context)
{
@@ -754,10 +754,10 @@
int status = 0;
int bufferSize, sgreqSize;
int i;
- DEV_SCATTER_DMA_VIRTUAL_INFO *pVirtualInfo;
+ struct dev_scatter_dma_virtual_info *pVirtualInfo;
HIF_SCATTER_REQ *pReq;
- bufferSize = sizeof(DEV_SCATTER_DMA_VIRTUAL_INFO) +
+ bufferSize = sizeof(struct dev_scatter_dma_virtual_info) +
2 * (A_GET_CACHE_LINE_BYTES()) + AR6K_MAX_TRANSFER_SIZE_PER_SCATTER;
sgreqSize = sizeof(HIF_SCATTER_REQ) +
@@ -775,8 +775,8 @@
A_MEMZERO(pReq, sgreqSize);
/* the virtual DMA starts after the scatter request struct */
- pVirtualInfo = (DEV_SCATTER_DMA_VIRTUAL_INFO *)((u8 *)pReq + sgreqSize);
- A_MEMZERO(pVirtualInfo, sizeof(DEV_SCATTER_DMA_VIRTUAL_INFO));
+ pVirtualInfo = (struct dev_scatter_dma_virtual_info *)((u8 *)pReq + sgreqSize);
+ A_MEMZERO(pVirtualInfo, sizeof(struct dev_scatter_dma_virtual_info));
pVirtualInfo->pVirtDmaBuffer = &pVirtualInfo->DataArea[0];
/* align buffer to cache line in case host controller can actually DMA this */
diff --git a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index 247cf56..3e4ece8 100644
--- a/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -322,10 +322,10 @@
#endif
/* completely virtual */
-typedef struct _DEV_SCATTER_DMA_VIRTUAL_INFO {
+struct dev_scatter_dma_virtual_info {
u8 *pVirtDmaBuffer; /* dma-able buffer - CPU accessible address */
u8 DataArea[1]; /* start of data area */
-} DEV_SCATTER_DMA_VIRTUAL_INFO;
+};