staging: brcm80211: remove struct osl_info from function prototypes

A couple of functions with struct osl_info do not use this parameter
so it is removed from the function prototypes.

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>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index cd14b125d9629b2e2131a7c582d9c718a52e4448..4962650b0cfc532a273d1c2438a705d39fd90fd5 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1047,20 +1047,20 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf)
 }
 
 static inline void *
-osl_pkt_frmnative(struct osl_info *osh, struct sk_buff *skb)
+osl_pkt_frmnative(struct sk_buff *skb)
 {
        return (void *)skb;
 }
 #define PKTFRMNATIVE(osh, skb) \
-       osl_pkt_frmnative((osh), (struct sk_buff *)(skb))
+       osl_pkt_frmnative((struct sk_buff *)(skb))
 
 static inline struct sk_buff *
-osl_pkt_tonative(struct osl_info *osh, void *pkt)
+osl_pkt_tonative(void *pkt)
 {
        return (struct sk_buff *)pkt;
 }
 #define PKTTONATIVE(osh, pkt)  \
-       osl_pkt_tonative((osh), (pkt))
+       osl_pkt_tonative((pkt))
 
 static int dhd_start_xmit(struct sk_buff *skb, struct net_device *net)
 {

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index cd5c083f472638d7e8acb9d461de0d20df5ae045..060a5e0b15198de3313179896c86d836240c39d8 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -2832,7 +2832,6 @@ exit:
 
 void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
 {
-       struct osl_info *osh = bus->dhd->osh;
        u32 local_hostintmask;
        u8 saveclk;
        uint retries;
@@ -2882,7 +2881,7 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
        dhdsdio_clkctl(bus, CLK_SDONLY, false);
 
        /* Clear the data packet queues */
-       pktq_flush(osh, &bus->txq, true);
+       pktq_flush(&bus->txq, true);
 
        /* Clear any held glomming stuff */
        if (bus->glomd)

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index e9cdb05e531bc37f10f28b655350cbd064f1a9d9..c0166480cc8b20d3396f2d2e8ea5657d8e4491da 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -1195,7 +1195,7 @@ ampdu_cleanup_tid_ini(struct ampdu_info *ampdu, scb_ampdu_t *scb_ampdu, u8 tid,
        ASSERT(ini == &scb_ampdu->ini[ini->tid]);
 
        /* free all buffered tx packets */
-       pktq_pflush(ampdu->wlc->osh, &scb_ampdu->txq, ini->tid, true, NULL, 0);
+       pktq_pflush(&scb_ampdu->txq, ini->tid, true, NULL, 0);
 }
 
 /* initialize the initiator code for tid */

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index ace2000fd08a0bc1d42ce877f1bef1ae0c831c8b..e046727c58e4d9441011df5eb8ea8481c7da97ec 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -2725,7 +2725,7 @@ uint wlc_down(struct wlc_info *wlc)
 
        /* flush tx queues */
        for (qi = wlc->tx_queues; qi != NULL; qi = qi->next) {
-               pktq_flush(wlc->osh, &qi->q, true, NULL, 0);
+               pktq_flush(&qi->q, true, NULL, 0);
                ASSERT(pktq_empty(&qi->q));
        }
 

diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index 0f1363414b974d3ade2e2987259e6e7c57b3ba62..fc2a2a910129cca9acc4afb1d6096cf7b58892ef 100644 (file)
--- a/drivers/staging/brcm80211/include/bcmutils.h
+++ b/drivers/staging/brcm80211/include/bcmutils.h
@@ -100,10 +100,10 @@ extern void pkt_buf_free_skb(struct sk_buff *skb);
 
 /* Empty the queue at particular precedence level */
 #ifdef BRCM_FULLMAC
-       extern void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec,
+       extern void pktq_pflush(struct pktq *pq, int prec,
                bool dir);
 #else
-       extern void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec,
+       extern void pktq_pflush(struct pktq *pq, int prec,
                bool dir, ifpkt_cb_t fn, int arg);
 #endif /* BRCM_FULLMAC */
 
@@ -131,9 +131,9 @@ extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
 /* prec_out may be NULL if caller is not interested in return value */
        extern struct sk_buff *pktq_peek_tail(struct pktq *pq, int *prec_out);
 #ifdef BRCM_FULLMAC
-       extern void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir);
+       extern void pktq_flush(struct pktq *pq, bool dir);
 #else
-       extern void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir,
+       extern void pktq_flush(struct pktq *pq, bool dir,
                ifpkt_cb_t fn, int arg);
 #endif
 

diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 5bb4770e56fcac84ac0b1035c2d5217345580eb3..00e5c4922b80a485cfe942488841da6756d2250b 100644 (file)
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -231,7 +231,7 @@ struct sk_buff *BCMFASTPATH pktq_pdeq_tail(struct pktq *pq, int prec)
 }
 
 #ifdef BRCM_FULLMAC
-void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir)
+void pktq_pflush(struct pktq *pq, int prec, bool dir)
 {
        struct pktq_prec *q;
        struct sk_buff *p;
@@ -250,16 +250,16 @@ void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir)
        q->tail = NULL;
 }
 
-void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir)
+void pktq_flush(struct pktq *pq, bool dir)
 {
        int prec;
        for (prec = 0; prec < pq->num_prec; prec++)
-               pktq_pflush(osh, pq, prec, dir);
+               pktq_pflush(pq, prec, dir);
        ASSERT(pq->len == 0);
 }
 #else /* !BRCM_FULLMAC */
 void
-pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir,
+pktq_pflush(struct pktq *pq, int prec, bool dir,
            ifpkt_cb_t fn, int arg)
 {
        struct pktq_prec *q;
@@ -291,12 +291,12 @@ pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir,
        }
 }
 
-void pktq_flush(struct osl_info *osh, struct pktq *pq, bool dir,
+void pktq_flush(struct pktq *pq, bool dir,
                ifpkt_cb_t fn, int arg)
 {
        int prec;
        for (prec = 0; prec < pq->num_prec; prec++)
-               pktq_pflush(osh, pq, prec, dir, fn, arg);
+               pktq_pflush(pq, prec, dir, fn, arg);
        if (fn == NULL)
                ASSERT(pq->len == 0);
 }