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

Commit 861f6703 authored by Brett Rudley's avatar Brett Rudley Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: stragglers not handled by unifdef 



Part of BMAC removal.

Signed-off-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f9ec9727

drivers/staging/brcm80211/include/linux_osl.h

+0 −37
Original line number Diff line number Diff line
@@ -61,15 +61,6 @@ extern uint osl_pci_slot(struct osl_info *osh); 
		((struct osl_pubinfo *)osh)->tx_ctx = _tx_ctx;	\

	} while (0)



#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)

#define REGOPSSET(osh, rreg, wreg, ctx)			\

	do {						\

		((struct osl_pubinfo *)osh)->rreg_fn = rreg;	\

		((struct osl_pubinfo *)osh)->wreg_fn = wreg;	\

		((struct osl_pubinfo *)osh)->reg_ctx = ctx;	\

	} while (0)

#endif



#define BUS_SWAP32(v)		(v)



extern void *osl_dma_alloc_consistent(struct osl_info *osh, uint size,
@@ -321,32 +312,4 @@ osl_pkt_tonative(struct osl_pubinfo *osh, void *pkt) 
/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because skb->ip_summed is overloaded */

#define PKTSHARED(skb)                  (((struct sk_buff *)(skb))->cloned)



#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)

#define RPC_READ_REG(osh, r) (\

	sizeof(*(r)) == sizeof(u8) ? osl_readb((osh), (volatile u8*)(r)) : \

	sizeof(*(r)) == sizeof(u16) ? osl_readw((osh), (volatile u16*)(r)) : \

	osl_readl((osh), (volatile u32*)(r)) \

)

#define RPC_WRITE_REG(osh, r, v) do { \

	switch (sizeof(*(r))) { \

	case sizeof(u8): \

		osl_writeb((osh), (volatile u8*)(r), (u8)(v)); \

		break; \

	case sizeof(u16): \

		osl_writew((osh), (volatile u16*)(r), (u16)(v)); \

		break; \

	case sizeof(u32): \

		osl_writel((osh), (volatile u32*)(r), (u32)(v)); \

		break; \

	} \

} while (0)



extern u8 osl_readb(struct osl_info *osh, volatile u8 *r);

extern u16 osl_readw(struct osl_info *osh, volatile u16 *r);

extern u32 osl_readl(struct osl_info *osh, volatile u32 *r);

extern void osl_writeb(struct osl_info *osh, volatile u8 *r, u8 v);

extern void osl_writew(struct osl_info *osh, volatile u16 *r, u16 v);

extern void osl_writel(struct osl_info *osh, volatile u32 *r, u32 v);

#endif				/* BCMSDIO */



#endif				/* _linux_osl_h_ */

drivers/staging/brcm80211/include/osl.h

+0 −5
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ struct osl_pubinfo { 
	bool mmbus;		/* Bus supports memory-mapped registers */

	pktfree_cb_fn_t tx_fn;	/* Callback function for PKTFREE */

	void *tx_ctx;		/* Context to the callback function */

#if defined(BCMSDIO) && !defined(BRCM_FULLMAC)

	osl_rreg_fn_t rreg_fn;	/* Read Register function */

	osl_wreg_fn_t wreg_fn;	/* Write Register function */

	void *reg_ctx;		/* Context to the reg callback functions */

#endif

};



/* osl handle type forward declaration */

drivers/staging/brcm80211/sys/wlc_cfg.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 


#define IS_SINGLEBAND_5G(device)	0



/* Keep WLC_HIGH_ONLY, WLC_SPLIT for USB extension later on */



/* **** Core type/rev defaults **** */

#define D11_DEFAULT	0x0fffffb0	/* Supported  D11 revs: 4, 5, 7-27

					 * also need to update wlc.h MAXCOREREV

drivers/staging/brcm80211/sys/wlc_mac80211.h

+0 −1
Original line number Diff line number Diff line
@@ -815,7 +815,6 @@ struct antsel_info { 
#define WLC_IS_MATCH_SSID(wlc, ssid1, ssid2, len1, len2) \

	((len1 == len2) && !bcmp(ssid1, ssid2, len1))



/* API shared by both WLC_HIGH and WLC_LOW driver */

extern void wlc_high_dpc(wlc_info_t *wlc, u32 macintstatus);

extern void wlc_fatal_error(wlc_info_t *wlc);

extern void wlc_bmac_rpc_watchdog(wlc_info_t *wlc);

drivers/staging/brcm80211/sys/wlc_pub.h

+0 −4
Original line number Diff line number Diff line
@@ -610,10 +610,6 @@ extern void wlc_pmkid_event(struct wlc_bsscfg *cfg); 
#define BAND_2G_NAME		"2.4G"

#define BAND_5G_NAME		"5G"



#if defined(BCMSDIO) || defined(WLC_HIGH_ONLY)

void wlc_device_removed(void *arg);

#endif



/* BMAC RPC: 7 u32 params: pkttotlen, fifo, commit, fid, txpktpend, pktflag, rpc_id */

#define WLC_RPCTX_PARAMS		32