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

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

staging: brcm80211: removed unused #ifdef sections 



Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 38a02acd

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+0 −4
Original line number Diff line number Diff line
@@ -34,15 +34,11 @@ 
#include "dhd_dbg.h"

#include "wl_cfg80211.h"



#if !defined(SDIO_VENDOR_ID_BROADCOM)

#define SDIO_VENDOR_ID_BROADCOM		0x02d0

#endif				/* !defined(SDIO_VENDOR_ID_BROADCOM) */



#define DMA_ALIGN_MASK	0x03



#if !defined(SDIO_DEVICE_ID_BROADCOM_4329)

#define SDIO_DEVICE_ID_BROADCOM_4329	0x4329

#endif		/* !defined(SDIO_DEVICE_ID_BROADCOM_4329) */



static int brcmf_sdioh_get_cisaddr(struct brcmf_sdio_dev *sdiodev, u32 regaddr);

static int brcmf_ops_sdio_probe(struct sdio_func *func,

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+0 −16
Original line number Diff line number Diff line
@@ -120,18 +120,6 @@ uint brcmf_radio_up = 1; 
char iface_name[IFNAMSIZ] = "wlan";

module_param_string(iface_name, iface_name, IFNAMSIZ, 0);



/* The following are specific to the SDIO dongle */



#ifdef SDTEST

/* Echo packet generator (pkts/s) */

uint brcmf_pktgen;

module_param(brcmf_pktgen, uint, 0);



/* Echo packet len (0 => sawtooth, max 2040) */

uint brcmf_pktgen_len;

module_param(brcmf_pktgen_len, uint, 0);

#endif



static int brcmf_toe_get(struct brcmf_info *drvr_priv, int idx, u32 *toe_ol);

static int brcmf_toe_set(struct brcmf_info *drvr_priv, int idx, u32 toe_ol);

static int brcmf_host_event(struct brcmf_info *drvr_priv, int *ifidx,
@@ -1065,7 +1053,6 @@ done: 


static int brcmf_netdev_stop(struct net_device *net)

{

#if !defined(IGNORE_ETH0_DOWN)

	struct brcmf_info *drvr_priv = *(struct brcmf_info **) netdev_priv(net);



	brcmf_dbg(TRACE, "Enter\n");
@@ -1076,9 +1063,6 @@ static int brcmf_netdev_stop(struct net_device *net) 
	/* Set state and stop OS transmissions */

	drvr_priv->pub.up = 0;

	netif_stop_queue(net);

#else

	brcmf_dbg(ERROR, "BYPASSed due to BRCM compilation: under investigation\n");

#endif				/* !defined(IGNORE_ETH0_DOWN) */



	return 0;

}

drivers/staging/brcm80211/brcmfmac/dhd_proto.h

+0 −5
Original line number Diff line number Diff line
@@ -17,13 +17,8 @@ 
#ifndef _BRCMF_PROTO_H_

#define _BRCMF_PROTO_H_



#ifndef IOCTL_RESP_TIMEOUT

#define IOCTL_RESP_TIMEOUT  2000	/* In milli second */

#endif



#ifndef IOCTL_CHIP_ACTIVE_TIMEOUT

#define IOCTL_CHIP_ACTIVE_TIMEOUT  10	/* In milli second */

#endif



/*

 * Exported from the brcmf protocol module (brcmf_cdc)

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+0 −22
Original line number Diff line number Diff line
@@ -368,10 +368,8 @@ struct rte_console { 
 * for HT availability, it could take a couple hundred ms more, so

 * max out at a 1 second (1000000us).

 */

#if (PMU_MAX_TRANSITION_DLY <= 1000000)

#undef PMU_MAX_TRANSITION_DLY

#define PMU_MAX_TRANSITION_DLY 1000000

#endif



/* Value for ChipClockCSR during initial setup */

#define BRCMF_INIT_CLKCTL1	(SBSDIO_FORCE_HW_CLKREQ_OFF |	\
@@ -3145,19 +3143,6 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) 
	brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,

			       SBSDIO_FUNC1_CHIPCLKCSR, saveclk, &err);



#if defined(OOB_INTR_ONLY)

	/* Host registration for OOB interrupt */

	if (brcmf_sdio_register_oob_intr(bus->dhd)) {

		brcmf_sdbrcm_wd_timer(bus, 0);

		brcmf_dbg(ERROR, "Host failed to resgister for OOB\n");

		ret = -ENODEV;

		goto exit;

	}



	/* Enable oob at firmware */

	brcmf_sdbrcm_enable_oob_intr(bus, true);

#endif		/* defined(OOB_INTR_ONLY) */



	/* If we didn't come up, turn off backplane clock */

	if (drvr->busstate != BRCMF_BUS_DATA)

		brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
@@ -4533,15 +4518,8 @@ void brcmf_sdbrcm_isr(void *arg) 
	if (!bus->intr)

		brcmf_dbg(ERROR, "isr w/o interrupt configured!\n");



#if defined(SDIO_ISR_THREAD)

	brcmf_dbg(TRACE, "Calling brcmf_sdbrcm_dpc()\n");

	while (brcmf_sdbrcm_dpc(bus))

		;

#else

	bus->dpc_sched = true;

	brcmf_sdbrcm_sched_dpc(bus);

#endif



}



extern bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+0 −6
Original line number Diff line number Diff line
@@ -2337,14 +2337,10 @@ static struct wireless_dev *brcmf_alloc_wdev(s32 sizeof_iface, 
	wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;

	wdev->wiphy->cipher_suites = __wl_cipher_suites;

	wdev->wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);

#ifndef WL_POWERSAVE_DISABLED

	wdev->wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT;	/* enable power

								 * save mode

								 * by default

								 */

#else

	wdev->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

#endif				/* !WL_POWERSAVE_DISABLED */

	err = wiphy_register(wdev->wiphy);

	if (unlikely(err < 0)) {

		WL_ERR("Couldn not register wiphy device (%d)\n", err);
@@ -3409,9 +3405,7 @@ static s32 wl_init_priv(struct brcmf_cfg80211_priv *cfg_priv) 
	s32 err = 0;



	cfg_priv->scan_request = NULL;

#ifndef WL_POWERSAVE_DISABLED

	cfg_priv->pwr_save = true;

#endif /* WL_POWERSAVE_DISABLED */

	cfg_priv->iscan_on = true;	/* iscan on & off switch.

				 we enable iscan per default */

	cfg_priv->roam_on = true;	/* roam on & off switch.