summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rt2870/rt_main_dev.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-04-26 16:05:34 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 11:00:46 -0700
commit2891e9087375a29701a604c70aaafb027a20f7e5 (patch)
tree5cc2dc33e616bce5adf85c527db71ca3e1d64d9e /drivers/staging/rt2870/rt_main_dev.c
parent2074a80c8b875baee92b7f040a0afd129cbcac26 (diff)
downloadop-kernel-dev-2891e9087375a29701a604c70aaafb027a20f7e5.zip
op-kernel-dev-2891e9087375a29701a604c70aaafb027a20f7e5.tar.gz
Staging: rt2870: remove dead INF_AMAZON_SE code
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2870/rt_main_dev.c')
-rw-r--r--drivers/staging/rt2870/rt_main_dev.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index 87d7c78..1c8ea2a 100644
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -349,13 +349,6 @@ int rt28xx_close(IN PNET_DEV dev)
ba_reordering_resource_release(pAd);
#endif // DOT11_N_SUPPORT //
-#ifdef RT2870
-#ifdef INF_AMAZON_SE
- if (pAd->UsbVendorReqBuf)
- os_free_mem(pAd, pAd->UsbVendorReqBuf);
-#endif // INF_AMAZON_SE //
-#endif // RT2870 //
-
RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_START_UP);
return 0; // close ok
@@ -369,18 +362,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
NDIS_STATUS Status;
UINT32 MacCsr0 = 0;
-#ifdef RT2870
-#ifdef INF_AMAZON_SE
- init_MUTEX(&(pAd->UsbVendorReq_semaphore));
- os_alloc_mem(pAd, (PUCHAR)&pAd->UsbVendorReqBuf, MAX_PARAM_BUFFER_SIZE - 1);
- if (pAd->UsbVendorReqBuf == NULL)
- {
- DBGPRINT(RT_DEBUG_ERROR, ("Allocate vendor request temp buffer failed!\n"));
- goto err0;
- }
-#endif // INF_AMAZON_SE //
-#endif // RT2870 //
-
#ifdef DOT11_N_SUPPORT
// Allocate BA Reordering memory
ba_reordering_resource_init(pAd, MAX_REORDERING_MPDU_NUM);
@@ -632,9 +613,7 @@ err1:
// shall not set ml_priv to NULL here because the ml_priv didn't been free yet.
//net_dev->ml_priv = 0;
-#ifdef INF_AMAZON_SE
-err0:
-#endif // INF_AMAZON_SE //
+
printk("!!! %s Initialized fail !!!\n", RT28xx_CHIP_NAME);
return FALSE;
} /* End of rt28xx_init */
OpenPOWER on IntegriCloud