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

Commit 6cd8d7bf authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed Broadcom specific acronym 'hnd'. 



Code cleanup.

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

drivers/staging/brcm80211/brcmfmac/pcicfg.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
/* PCI configuration address space size */

#define PCI_SZPCR		256



/* Everything below is BRCM HND proprietary */

/* Everything below is Broadcom specific */



/* Brcm PCI configuration registers */

#define PCI_BAR0_WIN		0x80	/* backplane address space accessed by BAR0 */

drivers/staging/brcm80211/brcmsmac/aiutils.h

+1 −3
Original line number Diff line number Diff line
@@ -151,9 +151,7 @@ 
					 * maps all unused address ranges

					 */



/* There are TWO constants on all HND chips: SI_ENUM_BASE above,

 * and chipcommon being the first core:

 */

/* chipcommon being the first core: */

#define	SI_CC_IDX		0



/* SOC Interconnect types (aka chip types) */

drivers/staging/brcm80211/brcmsmac/bcmdma.h

+3 −3
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ typedef volatile struct { 


/* range param for dma_getnexttxp() and dma_txreclaim */

typedef enum txd_range {

	HNDDMA_RANGE_ALL = 1,

	HNDDMA_RANGE_TRANSMITTED,

	HNDDMA_RANGE_TRANSFERED

	DMA_RANGE_ALL = 1,

	DMA_RANGE_TRANSMITTED,

	DMA_RANGE_TRANSFERED

} txd_range_t;



/* dma function type */

drivers/staging/brcm80211/brcmsmac/d11.h

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ typedef volatile struct { 


/*

 * Host Interface Registers

 * - primed from hnd_cores/dot11mac/systemC/registers/ihr.h

 * - but definitely not complete

 */

typedef volatile struct _d11regs {

	/* Device Control ("semi-standard host registers") */

drivers/staging/brcm80211/brcmsmac/dma.c

+9 −9
Original line number Diff line number Diff line
@@ -1292,9 +1292,9 @@ static void dma64_txreclaim(dma_info_t *di, txd_range_t range) 
	void *p;



	DMA_TRACE(("%s: dma_txreclaim %s\n", di->name,

		   (range == HNDDMA_RANGE_ALL) ? "all" :

		   (range == DMA_RANGE_ALL) ? "all" :

		   ((range ==

		     HNDDMA_RANGE_TRANSMITTED) ? "transmitted" :

		     DMA_RANGE_TRANSMITTED) ? "transmitted" :

		    "transferred")));



	if (di->txin == di->txout)
@@ -1649,11 +1649,11 @@ static int dma64_txfast(dma_info_t *di, struct sk_buff *p0, 
/*

 * Reclaim next completed txd (txds if using chained buffers) in the range

 * specified and return associated packet.

 * If range is HNDDMA_RANGE_TRANSMITTED, reclaim descriptors that have be

 * If range is DMA_RANGE_TRANSMITTED, reclaim descriptors that have be

 * transmitted as noted by the hardware "CurrDescr" pointer.

 * If range is HNDDMA_RANGE_TRANSFERED, reclaim descriptors that have be

 * If range is DMA_RANGE_TRANSFERED, reclaim descriptors that have be

 * transferred by the DMA as noted by the hardware "ActiveDescr" pointer.

 * If range is HNDDMA_RANGE_ALL, reclaim all txd(s) posted to the ring and

 * If range is DMA_RANGE_ALL, reclaim all txd(s) posted to the ring and

 * return associated packet regardless of the value of hardware pointers.

 */

static void *dma64_getnexttxp(dma_info_t *di, txd_range_t range)
@@ -1663,9 +1663,9 @@ static void *dma64_getnexttxp(dma_info_t *di, txd_range_t range) 
	void *txp;



	DMA_TRACE(("%s: dma_getnexttxp %s\n", di->name,

		   (range == HNDDMA_RANGE_ALL) ? "all" :

		   (range == DMA_RANGE_ALL) ? "all" :

		   ((range ==

		     HNDDMA_RANGE_TRANSMITTED) ? "transmitted" :

		     DMA_RANGE_TRANSMITTED) ? "transmitted" :

		    "transferred")));



	if (di->ntxd == 0)
@@ -1674,7 +1674,7 @@ static void *dma64_getnexttxp(dma_info_t *di, txd_range_t range) 
	txp = NULL;



	start = di->txin;

	if (range == HNDDMA_RANGE_ALL)

	if (range == DMA_RANGE_ALL)

		end = di->txout;

	else {

		dma64regs_t *dregs = di->d64txregs;
@@ -1685,7 +1685,7 @@ static void *dma64_getnexttxp(dma_info_t *di, txd_range_t range) 
				 D64_XS0_CD_MASK) -

				di->xmtptrbase) & D64_XS0_CD_MASK, dma64dd_t));



		if (range == HNDDMA_RANGE_TRANSFERED) {

		if (range == DMA_RANGE_TRANSFERED) {

			active_desc =

			    (u16) (R_REG(&dregs->status1) &

				      D64_XS1_AD_MASK);