Commit 2447ffb0 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: stop referencing brcmf_sdio in common layer 



brcmf_sdio is the data structure for sdio bus layer. Stop
referencing brcmf_sdio from common layer. This patch is part of
the fullmac bus interface refactoring.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 712ac5b3

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+1 −4
Original line number Diff line number Diff line
@@ -583,14 +583,12 @@ struct brcmf_bus { 
};



/* Forward decls for struct brcmf_pub (see below) */

struct brcmf_sdio;		/* device bus info */

struct brcmf_proto;	/* device communication protocol info */

struct brcmf_cfg80211_dev; /* cfg80211 device info */



/* Common structure for module and instance linkage */

struct brcmf_pub {

	/* Linkage ponters */

	struct brcmf_sdio *bus;

	struct brcmf_bus *bus_if;

	struct brcmf_proto *prot;

	struct brcmf_cfg80211_dev *config;
@@ -669,8 +667,7 @@ extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen, 
 * Returned structure should have bus and prot pointers filled in.

 * bus_hdrlen specifies required headroom for bus module header.

 */

extern int brcmf_attach(struct brcmf_sdio *bus,

			uint bus_hdrlen, struct device *dev);

extern int brcmf_attach(uint bus_hdrlen, struct device *dev);

extern int brcmf_net_attach(struct brcmf_pub *drvr, int idx);

extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev);

drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h

+0 −3
Original line number Diff line number Diff line
@@ -44,7 +44,4 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen); 


extern int

brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen);



extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);



#endif				/* _BRCMF_BUS_H_ */

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+1 −3
Original line number Diff line number Diff line
@@ -922,8 +922,7 @@ void brcmf_del_if(struct brcmf_pub *drvr, int ifidx) 
	}

}



int brcmf_attach(struct brcmf_sdio *bus, uint bus_hdrlen,

			       struct device *dev)

int brcmf_attach(uint bus_hdrlen, struct device *dev)

{

	struct brcmf_pub *drvr = NULL;

	int ret = 0;
@@ -938,7 +937,6 @@ int brcmf_attach(struct brcmf_sdio *bus, uint bus_hdrlen, 
	mutex_init(&drvr->proto_block);



	/* Link to bus module */

	drvr->bus = bus;

	drvr->hdrlen = bus_hdrlen;

	drvr->bus_if = dev_get_drvdata(dev);

	drvr->bus_if->drvr = drvr;

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -3953,7 +3953,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev) 
	}



	/* Attach to the brcmf/OS/network interface */

	ret = brcmf_attach(bus, SDPCM_RESERVE, bus->sdiodev->dev);

	ret = brcmf_attach(SDPCM_RESERVE, bus->sdiodev->dev);

	if (ret != 0) {

		brcmf_dbg(ERROR, "brcmf_attach failed\n");

		goto fail;

drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ struct brcmf_sdreg { 
	int value;

};



struct brcmf_sdio;



struct brcmf_sdio_dev {

	struct sdio_func *func[SDIO_MAX_FUNCS];

	u8 num_funcs;			/* Supported funcs on client */
@@ -262,4 +264,6 @@ extern void brcmf_sdio_wdtmr_enable(struct brcmf_sdio_dev *sdiodev, 
extern void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev);

extern void brcmf_sdbrcm_disconnect(void *ptr);

extern void brcmf_sdbrcm_isr(void *arg);



extern void brcmf_sdbrcm_wd_timer(struct brcmf_sdio *bus, uint wdtick);

#endif				/* _BRCM_SDH_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE