A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-15 01:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

ath6kl: remove BMIENABLE_SET define

Browse source 
Leave the code in place as this is always defined statically.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Luis R. Rodriguez 2011-03-29 17:55:59 -07:00 • committed by Greg Kroah-Hartman
commit eb60cfa9b8
5 changed files with 28 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/ath6kl/Makefile
View file

@ -126,7 +126,6 @@ ccflags-y += -DWAPI_ENABLE
ccflags-y += -DCHECKSUM_OFFLOAD
ccflags-y += -DWLAN_HEADERS
ccflags-y += -DINIT_MODE_DRV_ENABLED
ccflags-y += -DBMIENABLE_SET
obj-$(CONFIG_ATH6K_LEGACY) := ath6kl.o
ath6kl-y += htc2/AR6000/ar6k.o

2
drivers/staging/ath6kl/os/linux/ar6000_android.c
View file

@ -37,7 +37,6 @@ char fwpath[256] = "/system/wifi";
int wowledon;
unsigned int enablelogcat;
extern int bmienable;
extern struct net_device *ar6000_devices[];
extern char ifname[];
@ -309,7 +308,6 @@ static void android_late_resume(struct early_suspend *h)
void android_module_init(OSDRV_CALLBACKS *osdrvCallbacks)
{
bmienable = 1;
if (ifname[0] == '\0')
strcpy(ifname, def_ifname);
#ifdef CONFIG_HAS_EARLYSUSPEND

72
drivers/staging/ath6kl/os/linux/ar6000_drv.c
View file

@ -118,7 +118,6 @@ struct hci_transport_callbacks ar6kHciTransCallbacks = { NULL };
#endif
unsigned int processDot11Hdr = 0;
int bmienable = BMIENABLE_DEFAULT;
char ifname[IFNAMSIZ] = {0,};
@ -164,7 +163,6 @@ unsigned int eppingtest=0;
module_param_string(ifname, ifname, sizeof(ifname), 0644);
module_param(wlaninitmode, int, 0644);
module_param(bmienable, int, 0644);
module_param(bypasswmi, bool, 0644);
module_param(debuglevel, uint, 0644);
module_param(tspecCompliance, int, 0644);
@ -1719,9 +1717,7 @@ ar6000_avail_ev(void *context, void *hif_handle)
BMIInit();
if (bmienable) {
ar6000_sysfs_bmi_init(ar);
}
ar6000_sysfs_bmi_init(ar);
{
struct bmi_target_info targ_info;
@ -1791,38 +1787,31 @@ ar6000_avail_ev(void *context, void *hif_handle)
/* when the module is unloaded. */
ar6000_devices[device_index] = dev;
/* Don't install the init function if BMI is requested */
if (!bmienable) {
ar6000_netdev_ops.ndo_init = ar6000_init;
} else {
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("BMI enabled: %d\n", wlaninitmode));
if ((wlaninitmode == WLAN_INIT_MODE_UDEV) ||
(wlaninitmode == WLAN_INIT_MODE_DRV))
{
int status = 0;
do {
if ((status = ar6000_sysfs_bmi_get_config(ar, wlaninitmode)) != 0)
{
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_avail: ar6000_sysfs_bmi_get_config failed\n"));
break;
}
#ifdef HTC_RAW_INTERFACE
if (!eppingtest && bypasswmi) {
break; /* Don't call ar6000_init for ART */
}
#endif
rtnl_lock();
status = (ar6000_init(dev)==0) ? 0 : A_ERROR;
rtnl_unlock();
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_avail: ar6000_init\n"));
}
} while (false);
if (status) {
init_status = status;
goto avail_ev_failed;
AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("BMI enabled: %d\n", wlaninitmode));
if ((wlaninitmode == WLAN_INIT_MODE_UDEV) ||
(wlaninitmode == WLAN_INIT_MODE_DRV)) {
int status = 0;
do {
if ((status = ar6000_sysfs_bmi_get_config(ar, wlaninitmode)) != 0) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_avail: ar6000_sysfs_bmi_get_config failed\n"));
break;
}
#ifdef HTC_RAW_INTERFACE
if (!eppingtest && bypasswmi) {
break; /* Don't call ar6000_init for ART */
}
#endif
rtnl_lock();
status = (ar6000_init(dev)==0) ? 0 : A_ERROR;
rtnl_unlock();
if (status) {
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("ar6000_avail: ar6000_init\n"));
}
} while (false);
if (status) {
init_status = status;
goto avail_ev_failed;
}
}
@ -1843,11 +1832,8 @@ ar6000_avail_ev(void *context, void *hif_handle)
(unsigned long)ar));
avail_ev_failed :
if (init_status) {
if (bmienable) {
ar6000_sysfs_bmi_deinit(ar);
}
}
if (init_status)
ar6000_sysfs_bmi_deinit(ar);
return init_status;
}
@ -2120,9 +2106,7 @@ ar6000_destroy(struct net_device *dev, unsigned int unregister)
/* cleanup any allocated AMSDU buffers */
ar6000_cleanup_amsdu_rxbufs(ar);
if (bmienable) {
ar6000_sysfs_bmi_deinit(ar);
}
ar6000_sysfs_bmi_deinit(ar);
/* Cleanup BMI */
BMICleanup();

6
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
View file

@ -227,12 +227,6 @@ typedef enum _AR6K_BIN_FILE {
#define SETUPBTDEV_DEFAULT 0
#endif /* SETUPBTDEV_ENABLED */
#ifdef BMIENABLE_SET
#define BMIENABLE_DEFAULT 1
#else
#define BMIENABLE_DEFAULT 0
#endif /* BMIENABLE_SET */
#ifdef ENABLEUARTPRINT_SET
#define ENABLEUARTPRINT_DEFAULT 1
#else

14
drivers/staging/ath6kl/os/linux/ioctl.c
View file

@ -33,7 +33,6 @@ u32 tcmdRxFreq;
extern unsigned int wmitimeout;
extern A_WAITQUEUE_HEAD arEvent;
extern int tspecCompliance;
extern int bmienable;
extern int loghci;
static int
@ -2105,16 +2104,9 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
#endif /* CONFIG_HOST_TCMD_SUPPORT */
case AR6000_XIOCTL_BMI_DONE:
if(bmienable)
{
rtnl_lock(); /* ar6000_init expects to be called holding rtnl lock */
ret = ar6000_init(dev);
rtnl_unlock();
}
else
{
ret = BMIDone(hifDevice);
}
rtnl_lock(); /* ar6000_init expects to be called holding rtnl lock */
ret = ar6000_init(dev);
rtnl_unlock();
break;
case AR6000_XIOCTL_BMI_READ_MEMORY: