staging: brcm80211: remove usage of struct osl_info from util sources (26bcc181) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2283,7 +2283,7 @@ dhdsdio_doiovar(dhd_bus_t bus, const bcm_iovar_t vi, u32 actionid,

	case IOV_SVAL(IOV_SDIOD_DRIVE):		case IOV_SVAL(IOV_SDIOD_DRIVE):
	dhd_sdiod_drive_strength = int_val;		dhd_sdiod_drive_strength = int_val;
	si_sdiod_drive_strength_init(bus->sih, bus->dhd->osh,		si_sdiod_drive_strength_init(bus->sih,
	dhd_sdiod_drive_strength);		dhd_sdiod_drive_strength);
	break;		break;

	@@ -3329,7 +3329,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
	F2SYNC, bus->dataptr,		F2SYNC, bus->dataptr,
	dlen, NULL, NULL, NULL);		dlen, NULL, NULL, NULL);
	sublen =		sublen =
	(u16) pktfrombuf(osh, pfirst, 0, dlen,		(u16) pktfrombuf(pfirst, 0, dlen,
	bus->dataptr);		bus->dataptr);
	if (sublen != dlen) {		if (sublen != dlen) {
	DHD_ERROR(("%s: FAILED TO COPY, dlen %d sublen %d\n",		DHD_ERROR(("%s: FAILED TO COPY, dlen %d sublen %d\n",
	@@ -5317,7 +5317,7 @@ dhdsdio_probe_attach(struct dhd_bus bus, struct osl_info osh, void *sdh,
	#endif /* DHD_DEBUG */		#endif /* DHD_DEBUG */

	/* si_attach() will provide an SI handle and scan the backplane */		/* si_attach() will provide an SI handle and scan the backplane */
	bus->sih = si_attach((uint) devid, osh, regsva, DHD_BUS, sdh,		bus->sih = si_attach((uint) devid, regsva, DHD_BUS, sdh,
	&bus->vars, &bus->varsz);		&bus->vars, &bus->varsz);
	if (!(bus->sih)) {		if (!(bus->sih)) {
	DHD_ERROR(("%s: si_attach failed!\n", __func__));		DHD_ERROR(("%s: si_attach failed!\n", __func__));
	@@ -5332,7 +5332,7 @@ dhdsdio_probe_attach(struct dhd_bus bus, struct osl_info osh, void *sdh,
	goto fail;		goto fail;
	}		}

	si_sdiod_drive_strength_init(bus->sih, osh, dhd_sdiod_drive_strength);		si_sdiod_drive_strength_init(bus->sih, dhd_sdiod_drive_strength);

	/* Get info on the ARM and SOCRAM cores... */		/* Get info on the ARM and SOCRAM cores... */
	if (!DHD_NOPMU(bus)) {		if (!DHD_NOPMU(bus)) {

drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19082,10 +19082,10 @@ wlc_phy_chanspec_nphy_setup(phy_info_t *pi, chanspec_t chanspec,

	if ((pi->sh->chip == BCM4716_CHIP_ID) \|\|		if ((pi->sh->chip == BCM4716_CHIP_ID) \|\|
	(pi->sh->chip == BCM47162_CHIP_ID)) {		(pi->sh->chip == BCM47162_CHIP_ID)) {
	si_pmu_spuravoid(pi->sh->sih, pi->sh->osh, spuravoid);		si_pmu_spuravoid(pi->sh->sih, spuravoid);
	} else {		} else {
	wlapi_bmac_core_phypll_ctl(pi->sh->physhim, false);		wlapi_bmac_core_phypll_ctl(pi->sh->physhim, false);
	si_pmu_spuravoid(pi->sh->sih, pi->sh->osh, spuravoid);		si_pmu_spuravoid(pi->sh->sih, spuravoid);
	wlapi_bmac_core_phypll_ctl(pi->sh->physhim, true);		wlapi_bmac_core_phypll_ctl(pi->sh->physhim, true);
	}		}

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -494,7 +494,6 @@ wlc_sendampdu(struct ampdu_info ampdu, struct wlc_txq_info qi,
	struct sk_buff **pdu, int prec)		struct sk_buff **pdu, int prec)
	{		{
	struct wlc_info *wlc;		struct wlc_info *wlc;
	struct osl_info *osh;
	struct sk_buff p, pkt[AMPDU_MAX_MPDU];		struct sk_buff p, pkt[AMPDU_MAX_MPDU];
	u8 tid, ndelim;		u8 tid, ndelim;
	int err = 0;		int err = 0;
	@@ -526,7 +525,6 @@ wlc_sendampdu(struct ampdu_info ampdu, struct wlc_txq_info qi,
	u16 qlen;		u16 qlen;

	wlc = ampdu->wlc;		wlc = ampdu->wlc;
	osh = wlc->osh;
	p = *pdu;		p = *pdu;

	ASSERT(p);		ASSERT(p);
	@@ -1070,7 +1068,7 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info ampdu, struct scb scb,
	wlc->pub->unit, txs->phyerr);		wlc->pub->unit, txs->phyerr);

	if (WL_ERROR_ON()) {		if (WL_ERROR_ON()) {
	prpkt("txpkt (AMPDU)", wlc->osh, p);		prpkt("txpkt (AMPDU)", p);
	wlc_print_txdesc((d11txh_t *) p->data);		wlc_print_txdesc((d11txh_t *) p->data);
	}		}
	wlc_print_txstatus(txs);		wlc_print_txstatus(txs);

drivers/staging/brcm80211/brcmsmac/wlc_bmac.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -674,7 +674,7 @@ int wlc_bmac_attach(struct wlc_info *wlc, u16 vendor, u16 device, uint unit,
	* Also initialize software state that depends on the particular hardware		* Also initialize software state that depends on the particular hardware
	* we are running.		* we are running.
	*/		*/
	wlc_hw->sih = si_attach((uint) device, osh, regsva, bustype, btparam,		wlc_hw->sih = si_attach((uint) device, regsva, bustype, btparam,
	&wlc_hw->vars, &wlc_hw->vars_size);		&wlc_hw->vars, &wlc_hw->vars_size);
	if (wlc_hw->sih == NULL) {		if (wlc_hw->sih == NULL) {
	WL_ERROR("wl%d: wlc_bmac_attach: si_attach failed\n", unit);		WL_ERROR("wl%d: wlc_bmac_attach: si_attach failed\n", unit);

drivers/staging/brcm80211/include/bcmsrom.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,14 +21,14 @@

	/* Prototypes */		/* Prototypes */
	extern int srom_var_init(si_t sih, uint bus, void curmap,		extern int srom_var_init(si_t sih, uint bus, void curmap,
	struct osl_info osh, char vars, uint count);		char *vars, uint count);

	extern int srom_read(si_t sih, uint bus, void curmap, struct osl_info *osh,		extern int srom_read(si_t sih, uint bus, void curmap,
	uint byteoff, uint nbytes, u16 *buf, bool check_crc);		uint byteoff, uint nbytes, u16 *buf, bool check_crc);

	/* parse standard PCMCIA cis, normally used by SB/PCMCIA/SDIO/SPI/OTP		/* parse standard PCMCIA cis, normally used by SB/PCMCIA/SDIO/SPI/OTP
	* and extract from it into name=value pairs		* and extract from it into name=value pairs
	*/		*/
	extern int srom_parsecis(struct osl_info osh, u8 *pcis, uint ciscnt,		extern int srom_parsecis(u8 **pcis, uint ciscnt,
	char *vars, uint count);		char *vars, uint count);
	#endif /* _bcmsrom_h_ */		#endif /* _bcmsrom_h_ */