Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 537ebbbe authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

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: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a30825a3

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

{

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+1 −2
Original line number Diff line number Diff line
@@ -2832,7 +2832,6 @@ dhd_bus_iovar_op(dhd_pub_t *dhdp, const char *name, 


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)

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/brcm80211/brcmsmac/wlc_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

	}

drivers/staging/brcm80211/include/bcmutils.h

+4 −4
Original line number Diff line number Diff line
@@ -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