staging: brcm80211: removed function declaration typedefs from dma.h part 3

Softmac related code cleanup. Typedefs are undesirable according to the
CodingStyle document.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c
index 3e732c8dd5a843ae2766470c98cf07140769f2ae..ebc08488f90a25d70b6014b765896e32d13fec9c 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/dma.c
+++ b/drivers/staging/brcm80211/brcmsmac/dma.c
@@ -404,7 +404,7 @@ const struct di_fcn_s dma64proc = {
        (di_peeknexttxp_t) _dma_peeknexttxp,
        (void (*)(struct dma_pub *)) _dma_txblock,
        (void (*)(struct dma_pub *)) _dma_txunblock,
-       (di_txactive_t) _dma_txactive,
+       (uint (*)(struct dma_pub *)) _dma_txactive,
        (void (*)(struct dma_pub *)) dma64_txrotate,
 
        (void (*)(struct dma_pub *)) _dma_rxinit,
@@ -427,9 +427,9 @@ const struct di_fcn_s dma64proc = {
        NULL,
        NULL,
        NULL,
-       (di_rxactive_t) _dma_rxactive,
-       (di_txpending_t) _dma_txpending,
-       (di_txcommitted_t) _dma_txcommitted,
+       (uint (*)(struct dma_pub *)) _dma_rxactive,
+       (uint (*)(struct dma_pub *)) _dma_txpending,
+       (uint (*)(struct dma_pub *)) _dma_txcommitted,
        39
 };
 

diff --git a/drivers/staging/brcm80211/brcmsmac/dma.h b/drivers/staging/brcm80211/brcmsmac/dma.h
index 6d6dbd85f3e670f3d2ecd4752bfa41f2439a530a..5dc7e0b62018348a389d2d605f63b09e8fc3a6de 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/dma.h
+++ b/drivers/staging/brcm80211/brcmsmac/dma.h
@@ -74,7 +74,6 @@ typedef void *(*di_peeknexttxp_t) (struct dma_pub *dmah);
 typedef void *(*di_peeknextrxp_t) (struct dma_pub *dmah);
 typedef void (*di_rxparam_get_t) (struct dma_pub *dmah, u16 *rxoffset,
                                  u16 *rxbufsize);
-typedef uint(*di_txactive_t) (struct dma_pub *dmah);
 typedef uint(*di_ctrlflags_t) (struct dma_pub *dmah, uint mask, uint flags);
 typedef char *(*di_dump_t) (struct dma_pub *dmah, struct brcmu_strbuf *b,
                            bool dumpring);
@@ -82,9 +81,6 @@ typedef char *(*di_dumptx_t) (struct dma_pub *dmah, struct brcmu_strbuf *b,
                              bool dumpring);
 typedef char *(*di_dumprx_t) (struct dma_pub *dmah, struct brcmu_strbuf *b,
                              bool dumpring);
-typedef uint(*di_rxactive_t) (struct dma_pub *dmah);
-typedef uint(*di_txpending_t) (struct dma_pub *dmah);
-typedef uint(*di_txcommitted_t) (struct dma_pub *dmah);
 
 /* dma opsvec */
 struct di_fcn_s {
@@ -105,7 +101,7 @@ struct di_fcn_s {
        di_peeknexttxp_t peeknexttxp;
        void (*txblock) (struct dma_pub *dmah);
        void (*txunblock) (struct dma_pub *dmah);
-       di_txactive_t txactive;
+       uint (*txactive)(struct dma_pub *dmah);
        void (*txrotate) (struct dma_pub *dmah);
 
        void (*rxinit)(struct dma_pub *dmah);
@@ -128,9 +124,9 @@ struct di_fcn_s {
        di_dump_t dump;
        di_dumptx_t dumptx;
        di_dumprx_t dumprx;
-       di_rxactive_t rxactive;
-       di_txpending_t txpending;
-       di_txcommitted_t txcommitted;
+       uint (*rxactive)(struct dma_pub *dmah);
+       uint (*txpending)(struct dma_pub *dmah);
+       uint (*txcommitted)(struct dma_pub *dmah);
        uint endnum;
 };