diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-03-02 15:18:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-02 19:48:05 -0500 |
commit | 3c4d93d42df252cb35f8f2cdec1671b14c685ca4 (patch) | |
tree | c7668b95864c7cf9ae3122e2556d83500af6bb94 | |
parent | 278d927d660b1652cf9a1425b0ce20a385ea9cff (diff) |
staging: brcm80211: remove of type definition osldma_t
The usage of variable of this type is not required so its use has
been removed from the driver.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/brcm80211/include/osl.h | 3 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/hnddma.c | 10 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h index e48c7ba9af1..24b114d6ca9 100644 --- a/drivers/staging/brcm80211/include/osl.h +++ b/drivers/staging/brcm80211/include/osl.h | |||
@@ -23,9 +23,6 @@ struct osl_info { | |||
23 | uint magic; | 23 | uint magic; |
24 | }; | 24 | }; |
25 | 25 | ||
26 | typedef struct osl_dmainfo osldma_t; | ||
27 | |||
28 | |||
29 | extern struct osl_info *osl_attach(void *pdev, uint bustype); | 26 | extern struct osl_info *osl_attach(void *pdev, uint bustype); |
30 | extern void osl_detach(struct osl_info *osh); | 27 | extern void osl_detach(struct osl_info *osh); |
31 | 28 | ||
diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c index 01d4b274520..e773b9bdc3b 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/util/hnddma.c | |||
@@ -101,7 +101,6 @@ typedef struct dma_info { | |||
101 | u16 txin; /* index of next descriptor to reclaim */ | 101 | u16 txin; /* index of next descriptor to reclaim */ |
102 | u16 txout; /* index of next descriptor to post */ | 102 | u16 txout; /* index of next descriptor to post */ |
103 | void **txp; /* pointer to parallel array of pointers to packets */ | 103 | void **txp; /* pointer to parallel array of pointers to packets */ |
104 | osldma_t *tx_dmah; /* DMA TX descriptor ring handle */ | ||
105 | hnddma_seg_map_t *txp_dmah; /* DMA MAP meta-data handle */ | 104 | hnddma_seg_map_t *txp_dmah; /* DMA MAP meta-data handle */ |
106 | dmaaddr_t txdpa; /* Aligned physical address of descriptor ring */ | 105 | dmaaddr_t txdpa; /* Aligned physical address of descriptor ring */ |
107 | dmaaddr_t txdpaorig; /* Original physical address of descriptor ring */ | 106 | dmaaddr_t txdpaorig; /* Original physical address of descriptor ring */ |
@@ -116,7 +115,6 @@ typedef struct dma_info { | |||
116 | u16 rxin; /* index of next descriptor to reclaim */ | 115 | u16 rxin; /* index of next descriptor to reclaim */ |
117 | u16 rxout; /* index of next descriptor to post */ | 116 | u16 rxout; /* index of next descriptor to post */ |
118 | void **rxp; /* pointer to parallel array of pointers to packets */ | 117 | void **rxp; /* pointer to parallel array of pointers to packets */ |
119 | osldma_t *rx_dmah; /* DMA RX descriptor ring handle */ | ||
120 | hnddma_seg_map_t *rxp_dmah; /* DMA MAP meta-data handle */ | 118 | hnddma_seg_map_t *rxp_dmah; /* DMA MAP meta-data handle */ |
121 | dmaaddr_t rxdpa; /* Aligned physical address of descriptor ring */ | 119 | dmaaddr_t rxdpa; /* Aligned physical address of descriptor ring */ |
122 | dmaaddr_t rxdpaorig; /* Original physical address of descriptor ring */ | 120 | dmaaddr_t rxdpaorig; /* Original physical address of descriptor ring */ |
@@ -203,7 +201,7 @@ static uint _dma_ctrlflags(dma_info_t *di, uint mask, uint flags); | |||
203 | static u8 dma_align_sizetobits(uint size); | 201 | static u8 dma_align_sizetobits(uint size); |
204 | static void *dma_ringalloc(dma_info_t *di, u32 boundary, uint size, | 202 | static void *dma_ringalloc(dma_info_t *di, u32 boundary, uint size, |
205 | u16 *alignbits, uint *alloced, | 203 | u16 *alignbits, uint *alloced, |
206 | dmaaddr_t *descpa, osldma_t **dmah); | 204 | dmaaddr_t *descpa); |
207 | 205 | ||
208 | /* Prototypes for 64-bit routines */ | 206 | /* Prototypes for 64-bit routines */ |
209 | static bool dma64_alloc(dma_info_t *di, uint direction); | 207 | static bool dma64_alloc(dma_info_t *di, uint direction); |
@@ -1088,7 +1086,7 @@ u8 dma_align_sizetobits(uint size) | |||
1088 | */ | 1086 | */ |
1089 | static void *dma_ringalloc(dma_info_t *di, u32 boundary, uint size, | 1087 | static void *dma_ringalloc(dma_info_t *di, u32 boundary, uint size, |
1090 | u16 *alignbits, uint *alloced, | 1088 | u16 *alignbits, uint *alloced, |
1091 | dmaaddr_t *descpa, osldma_t **dmah) | 1089 | dmaaddr_t *descpa) |
1092 | { | 1090 | { |
1093 | void *va; | 1091 | void *va; |
1094 | u32 desc_strtaddr; | 1092 | u32 desc_strtaddr; |
@@ -1229,7 +1227,7 @@ static bool dma64_alloc(dma_info_t *di, uint direction) | |||
1229 | 1227 | ||
1230 | if (direction == DMA_TX) { | 1228 | if (direction == DMA_TX) { |
1231 | va = dma_ringalloc(di, D64RINGALIGN, size, &align_bits, | 1229 | va = dma_ringalloc(di, D64RINGALIGN, size, &align_bits, |
1232 | &alloced, &di->txdpaorig, &di->tx_dmah); | 1230 | &alloced, &di->txdpaorig); |
1233 | if (va == NULL) { | 1231 | if (va == NULL) { |
1234 | DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(ntxd) failed\n", di->name)); | 1232 | DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(ntxd) failed\n", di->name)); |
1235 | return false; | 1233 | return false; |
@@ -1247,7 +1245,7 @@ static bool dma64_alloc(dma_info_t *di, uint direction) | |||
1247 | ASSERT(IS_ALIGNED((unsigned long)di->txd64, align)); | 1245 | ASSERT(IS_ALIGNED((unsigned long)di->txd64, align)); |
1248 | } else { | 1246 | } else { |
1249 | va = dma_ringalloc(di, D64RINGALIGN, size, &align_bits, | 1247 | va = dma_ringalloc(di, D64RINGALIGN, size, &align_bits, |
1250 | &alloced, &di->rxdpaorig, &di->rx_dmah); | 1248 | &alloced, &di->rxdpaorig); |
1251 | if (va == NULL) { | 1249 | if (va == NULL) { |
1252 | DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(nrxd) failed\n", di->name)); | 1250 | DMA_ERROR(("%s: dma64_alloc: DMA_ALLOC_CONSISTENT(nrxd) failed\n", di->name)); |
1253 | return false; | 1251 | return false; |