From 5cc86f28ca09738652000e73827a5579279ef810 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sun, 23 Aug 2009 15:31:54 +0200 Subject: Staging: rt2870: add eFuse support rt3070: * remove unused bEEPROMFile field from RTMP_ADAPTER rt2870: * propagate eFuse support from rt3070 Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rt2870/common/rtusb_io.c | 8 -------- drivers/staging/rt2870/rt2870.h | 16 ---------------- 2 files changed, 24 deletions(-) (limited to 'drivers/staging/rt2870') diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c index ff311e90772..94a3c5e0b2d 100644 --- a/drivers/staging/rt2870/common/rtusb_io.c +++ b/drivers/staging/rt2870/common/rtusb_io.c @@ -803,13 +803,9 @@ NTSTATUS RTUSBReadEEPROM( { NTSTATUS Status = STATUS_SUCCESS; -#ifdef RT30xx if(pAd->bUseEfuse) - { Status =eFuseRead(pAd, Offset, pData, length); - } else -#endif // RT30xx // { Status = RTUSB_VendorRequest( pAd, @@ -848,13 +844,9 @@ NTSTATUS RTUSBWriteEEPROM( { NTSTATUS Status = STATUS_SUCCESS; -#ifdef RT30xx if(pAd->bUseEfuse) - { Status = eFuseWrite(pAd, Offset, pData, length); - } else -#endif // RT30xx // { Status = RTUSB_VendorRequest( pAd, diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h index 1261764e87a..131f3329ac9 100644 --- a/drivers/staging/rt2870/rt2870.h +++ b/drivers/staging/rt2870/rt2870.h @@ -135,7 +135,6 @@ typedef struct _MGMT_STRUC { /* ----------------- EEPROM Related MACRO ----------------- */ -#ifdef RT30xx #define RT28xx_EEPROM_READ16(pAd, offset, var) \ do { \ RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \ @@ -150,21 +149,6 @@ typedef struct _MGMT_STRUC { _tmpVar = cpu2le16(var); \ RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(_tmpVar), 2); \ }while(0) -#endif // RT30xx // -#ifndef RT30xx -#define RT28xx_EEPROM_READ16(pAd, offset, var) \ - do { \ - RTUSBReadEEPROM(pAd, offset, (PUCHAR)&(var), 2); \ - var = le2cpu16(var); \ - }while(0) - -#define RT28xx_EEPROM_WRITE16(pAd, offset, var) \ - do{ \ - USHORT _tmpVar; \ - _tmpVar = cpu2le16(var); \ - RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(_tmpVar), 2); \ - }while(0) -#endif // RT30xx // /* ----------------- TASK/THREAD Related MACRO ----------------- */ #define RT28XX_TASK_THREAD_INIT(pAd, Status) \ -- cgit v1.2.3