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

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

staging: brcm80211: rename dhd_bus structure and functions 



The header file dhd_bus.h contains several function prototypes
starting with dhd_bus_ and using parameter with struct dhd_bus.
These function and structure have been renamed to brcmf_bus.

Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6758a717

drivers/staging/brcm80211/brcmfmac/dhd.h

+3 −3
Original line number Diff line number Diff line
@@ -522,14 +522,14 @@ struct brcmf_ioctl { 
};



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

struct dhd_bus;		/* device bus info */

struct brcmf_bus;		/* device bus info */

struct brcmf_proto;	/* device communication protocol info */

struct brcmf_info;	/* device driver info */



/* Common structure for module and instance linkage */

struct brcmf_pub {

	/* Linkage ponters */

	struct dhd_bus *bus;

	struct brcmf_bus *bus;

	struct brcmf_proto *prot;

	struct brcmf_info *info;
@@ -753,7 +753,7 @@ static inline void MUTEX_UNLOCK_WL_SCAN_SET(void) 
 * Returned structure should have bus and prot pointers filled in.

 * bus_hdrlen specifies required headroom for bus module header.

 */

extern struct brcmf_pub *brcmf_attach(struct dhd_bus *bus,

extern struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus,

				      uint bus_hdrlen);

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

extern int brcmf_netdev_wait_pend8021x(struct net_device *dev);

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+12 −12
Original line number Diff line number Diff line
@@ -33,26 +33,26 @@ 
extern uint brcmf_watchdog_ms;



/* Indicate (dis)interest in finding dongles. */

extern int dhd_bus_register(void);

extern void dhd_bus_unregister(void);

extern int brcmf_bus_register(void);

extern void brcmf_bus_unregister(void);



/* Stop bus module: clear pending frames, disable data flow */

extern void brcmf_sdbrcm_bus_stop(struct dhd_bus *bus, bool enforce_mutex);

extern void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex);



/* Initialize bus module: prepare for communication w/dongle */

extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex);



/* Send a data frame to the dongle.  Callee disposes of txp. */

extern int brcmf_sdbrcm_bus_txdata(struct dhd_bus *bus, struct sk_buff *txp);

extern int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *txp);



/* Send/receive a control message to/from the dongle.

 * Expects caller to enforce a single outstanding transaction.

 */

extern int

brcmf_sdbrcm_bus_txctl(struct dhd_bus *bus, unsigned char *msg, uint msglen);

brcmf_sdbrcm_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);



extern int

brcmf_sdbrcm_bus_rxctl(struct dhd_bus *bus, unsigned char *msg, uint msglen);

brcmf_sdbrcm_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint msglen);



extern void dhd_bus_isr(bool *InterruptRecognized,

			bool *QueueMiniportHandleInterrupt, void *arg);
@@ -67,15 +67,15 @@ extern void brcmf_sdbrcm_bus_dump(struct brcmf_pub *drvr, 
				  struct brcmu_strbuf *strbuf);



/* Clear any bus counters */

extern void dhd_bus_clearcounts(struct brcmf_pub *drvr);

extern void brcmf_bus_clearcounts(struct brcmf_pub *drvr);



/* return the dongle chipid */

extern uint dhd_bus_chip(struct dhd_bus *bus);

extern uint brcmf_bus_chip(struct brcmf_bus *bus);



extern void *dhd_bus_pub(struct dhd_bus *bus);

extern void *dhd_bus_txq(struct dhd_bus *bus);

extern uint dhd_bus_hdrlen(struct dhd_bus *bus);

extern void *brcmf_bus_drvr(struct brcmf_bus *bus);

extern void *brcmf_bus_txq(struct brcmf_bus *bus);

extern uint brcmf_bus_hdrlen(struct brcmf_bus *bus);



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

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



#endif				/* _dhd_bus_h_ */

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ brcmf_c_doiovar(struct brcmf_pub *drvr, const struct brcmu_iovar *vi, 
		drvr->tx_realloc = 0;

		drvr->wd_dpc_sched = 0;

		memset(&drvr->dstats, 0, sizeof(drvr->dstats));

		dhd_bus_clearcounts(drvr);

		brcmf_bus_clearcounts(drvr);

		break;



	case IOV_GVAL(IOV_IOCTLTIMEOUT):{

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+3 −3
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx) 
	up(&drvr_priv->sysioc_sem);

}



struct brcmf_pub *brcmf_attach(struct dhd_bus *bus, uint bus_hdrlen)

struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)

{

	struct brcmf_info *drvr_priv = NULL;

	struct net_device *net;
@@ -1761,7 +1761,7 @@ static void __exit brcmf_module_cleanup(void) 
{

	DHD_TRACE(("%s: Enter\n", __func__));



	dhd_bus_unregister();

	brcmf_bus_unregister();

}



static int __init brcmf_module_init(void)
@@ -1770,7 +1770,7 @@ static int __init brcmf_module_init(void) 


	DHD_TRACE(("%s: Enter\n", __func__));



	error = dhd_bus_register();

	error = brcmf_bus_register();



	if (error) {

		DHD_ERROR(("%s: dhd_bus_register failed\n", __func__));

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+106 −106

File changed.

Preview size limit exceeded, changes collapsed.