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

Commit 591e8142 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed unused code and definitions from fullmac 



Code cleanup.

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

drivers/staging/brcm80211/brcmfmac/bcmsdbus.h

+0 −21
Original line number Diff line number Diff line
@@ -125,21 +125,10 @@ struct brcmf_sdmmc_instance { 
extern int  brcmf_sdioh_osinit(struct sdioh_info *sd);

extern void brcmf_sdioh_osfree(struct sdioh_info *sd);



/* OS-independent interrupt handler */

extern bool brcmf_sdioh_check_client_intr(struct sdioh_info *sd);



/* Core interrupt enable/disable of device interrupts */

extern void brcmf_sdioh_dev_intr_on(struct sdioh_info *sd);

extern void brcmf_sdioh_dev_intr_off(struct sdioh_info *sd);



/* Register mapping routines */

extern u32 *brcmf_sdioh_reg_map(s32 addr, int size);

extern void brcmf_sdioh_reg_unmap(s32 addr, int size);



/* Interrupt (de)registration routines */

extern int  brcmf_sdioh_register_irq(struct sdioh_info *sd, uint irq);

extern void brcmf_sdioh_free_irq(uint irq, struct sdioh_info *sd);



/* attach, return handler on success, NULL if failed.

 *  The handler shall be provided by all subsequent calls. No local cache

 *  cfghdl points to the starting address of pci device mapped memory
@@ -153,10 +142,6 @@ brcmf_sdioh_interrupt_register(struct sdioh_info *si, 


extern int brcmf_sdioh_interrupt_deregister(struct sdioh_info *si);



/* query whether SD interrupt is enabled or not */

extern int

brcmf_sdioh_interrupt_query(struct sdioh_info *si, bool *onoff);



/* enable or disable SD interrupt */

extern int

brcmf_sdioh_interrupt_set(struct sdioh_info *si, bool enable_disable);
@@ -188,9 +173,6 @@ brcmf_sdioh_cfg_read(struct sdioh_info *si, uint fuc, u32 addr, u8 *data); 
extern int

brcmf_sdioh_cfg_write(struct sdioh_info *si, uint fuc, u32 addr, u8 *data);



/* query number of io functions */

extern uint brcmf_sdioh_query_iofnum(struct sdioh_info *si);



/* handle iovars */

extern int brcmf_sdioh_iovar_op(struct sdioh_info *si, const char *name,

			  void *params, int plen, void *arg, int len, bool set);
@@ -198,9 +180,6 @@ extern int brcmf_sdioh_iovar_op(struct sdioh_info *si, const char *name, 
/* Issue abort to the specified function and clear controller as needed */

extern int brcmf_sdioh_abort(struct sdioh_info *si, uint fnc);



/* Helper function */

void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card);



/* Watchdog timer interface for pm ops */

extern void brcmf_sdio_wdtmr_enable(bool enable);

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+0 −47
Original line number Diff line number Diff line
@@ -117,19 +117,6 @@ brcmf_sdcard_iovar_op(struct brcmf_sdio_card *card, const char *name, 
				    len, set);

}



bool brcmf_sdcard_intr_query(struct brcmf_sdio_card *card)

{

	int status;

	bool on;



	ASSERT(card);

	status = brcmf_sdioh_interrupt_query(card->sdioh, &on);

	if (status == 0)

		return false;

	else

		return on;

}



int brcmf_sdcard_intr_enable(struct brcmf_sdio_card *card)

{

	ASSERT(card);
@@ -159,15 +146,6 @@ int brcmf_sdcard_intr_dereg(struct brcmf_sdio_card *card) 
	return brcmf_sdioh_interrupt_deregister(card->sdioh);

}



int brcmf_sdcard_devremove_reg(struct brcmf_sdio_card *card,

			       void (*fn)(void *), void *argh)

{

	ASSERT(card);



	/* don't support yet */

	return -ENOTSUPP;

}



u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_card *card, uint fnc_num, u32 addr,

			 int *err)

{
@@ -551,26 +529,6 @@ int brcmf_sdcard_query_device(struct brcmf_sdio_card *card) 
	return card->vendevid;

}



uint brcmf_sdcard_query_iofnum(struct brcmf_sdio_card *card)

{

	if (!card)

		card = l_card;



	return brcmf_sdioh_query_iofnum(card->sdioh);

}



void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card)

{

	ASSERT(card);

	return card->sdioh;

}



/* Function to pass device-status bits to DHD. */

u32 brcmf_sdcard_get_dstatus(struct brcmf_sdio_card *card)

{

	return 0;

}



u32 brcmf_sdcard_cur_sbwad(struct brcmf_sdio_card *card)

{

	if (!card)
@@ -578,8 +536,3 @@ u32 brcmf_sdcard_cur_sbwad(struct brcmf_sdio_card *card) 


	return card->sbwad;

}
 


void brcmf_sdcard_chipinfo(struct brcmf_sdio_card *card, u32 chip, u32 chiprev)

{

	return;

}

drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c

+0 −45
Original line number Diff line number Diff line
@@ -58,51 +58,6 @@ static struct brcmf_sdioh_driver drvinfo = { NULL, NULL }; 
/* debugging macros */

#define SDLX_MSG(x)



/**

 * Checks to see if vendor and device IDs match a supported SDIO Host Controller.

 */

bool brcmf_sdio_chipmatch(u16 vendor, u16 device)

{

	/* Add other vendors and devices as required */



#ifdef BCMSDIOH_STD

	/* Check for Arasan host controller */

	if (vendor == VENDOR_SI_IMAGE)

		return true;



	/* Check for BRCM 27XX Standard host controller */

	if (device == BCM27XX_SDIOH_ID && vendor == PCI_VENDOR_ID_BROADCOM)

		return true;



	/* Check for BRCM Standard host controller */

	if (device == SDIOH_FPGA_ID && vendor == PCI_VENDOR_ID_BROADCOM)

		return true;



	/* Check for TI PCIxx21 Standard host controller */

	if (device == PCIXX21_SDIOH_ID && vendor == VENDOR_TI)

		return true;



	if (device == PCIXX21_SDIOH0_ID && vendor == VENDOR_TI)

		return true;



	/* Ricoh R5C822 Standard SDIO Host */

	if (device == R5C822_SDIOH_ID && vendor == VENDOR_RICOH)

		return true;



	/* JMicron Standard SDIO Host */

	if (device == JMICRON_SDIOH_ID && vendor == VENDOR_JMICRON)

		return true;

#endif				/* BCMSDIOH_STD */

#ifdef BCMSDIOH_SPI

	/* This is the PciSpiHost. */

	if (device == SPIH_FPGA_ID && vendor == PCI_VENDOR_ID_BROADCOM) {

		return true;

	}

#endif				/* BCMSDIOH_SPI */



	return false;

}



/* forward declarations */

int brcmf_sdio_probe(struct device *dev);

EXPORT_SYMBOL(brcmf_sdio_probe);

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+0 −13
Original line number Diff line number Diff line
@@ -244,19 +244,6 @@ extern int brcmf_sdioh_interrupt_deregister(struct sdioh_info *sd) 
	return 0;

}



extern int

brcmf_sdioh_interrupt_query(struct sdioh_info *sd, bool *onoff)

{

	sd_trace(("%s: Entering\n", __func__));

	*onoff = sd->client_intr_enabled;

	return 0;

}



uint brcmf_sdioh_query_iofnum(struct sdioh_info *sd)

{

	return sd->num_funcs;

}



/* IOVar table */

enum {

	IOV_MSGLEVEL = 1,

drivers/staging/brcm80211/brcmfmac/dhd.h

+0 −17
Original line number Diff line number Diff line
@@ -774,9 +774,6 @@ extern void brcmf_rx_frame(struct brcmf_pub *drvr, int ifidx, 
/* Return pointer to interface name */

extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);



/* Request scheduling of the bus dpc */

extern void brcmf_sched_dpc(struct brcmf_pub *drvr);



/* Notify tx completion */

extern void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp,

			     bool success);
@@ -793,12 +790,6 @@ extern int brcmf_os_ioctl_resp_wait(struct brcmf_pub *drvr, uint *condition, 
extern int brcmf_os_ioctl_resp_wake(struct brcmf_pub *drvr);

extern unsigned int brcmf_os_get_ioctl_resp_timeout(void);

extern void brcmf_os_set_ioctl_resp_timeout(unsigned int timeout_msec);

extern void brcmf_os_sdlock_sndup_rxq(struct brcmf_pub *drvr);

extern void brcmf_customer_gpio_wlan_ctrl(int onoff);

extern int brcmf_custom_get_mac_address(unsigned char *buf);

extern void brcmf_os_sdunlock_sndup_rxq(struct brcmf_pub *drvr);

extern void brcmf_os_sdlock_eventq(struct brcmf_pub *drvr);

extern void brcmf_os_sdunlock_eventq(struct brcmf_pub *drvr);

#ifdef BCMDBG

extern int brcmf_write_to_file(struct brcmf_pub *drvr, u8 *buf, int size);

#endif				/* BCMDBG */
@@ -817,14 +808,6 @@ extern int brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, void *handle, 
		      char *name, u8 *mac_addr, u32 flags, u8 bssidx);

extern void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx);



extern void brcmf_vif_add(struct brcmf_info *drvr_priv, int ifidx, char *name);

extern void brcmf_vif_del(struct brcmf_info *drvr_priv, int ifidx);



extern void brcmf_event(struct brcmf_info *drvr_priv, char *evpkt, int evlen,

			int ifidx);

extern void brcmf_vif_sendup(struct brcmf_info *drvr_priv, int ifidx,

			     unsigned char *cp, int len);



/* Send packet to dongle via data channel */

extern int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx,\

			 struct sk_buff *pkt);