Staging: rt28x0: remove unused ->eewrite methods

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2860/common/ee_efuse.c b/drivers/staging/rt2860/common/ee_efuse.c
index f52224441d234664ccb413ae82c71ab994f501f9..f29445096cfc758bc2d6c1b8e2e2cad14fc22924 100644 (file)
--- a/drivers/staging/rt2860/common/ee_efuse.c
+++ b/drivers/staging/rt2860/common/ee_efuse.c
@@ -1271,23 +1271,6 @@ int rtmp_ee_efuse_read16(
        return (*pValue);
 }
 
-
-int rtmp_ee_efuse_write16(
-       IN RTMP_ADAPTER *pAd,
-       IN USHORT Offset,
-       IN USHORT data)
-{
-    if(pAd->bFroceEEPROMBuffer||pAd->bEEPROMFile)
-    {
-        DBGPRINT(RT_DEBUG_TRACE,  ("Write to EEPROM Buffer\n"));
-        NdisMoveMemory(&(pAd->EEPROMImage[Offset]), &data, 2);
-    }
-    else
-        eFuseWriteRegisters(pAd, Offset, 2, &data);
-       return 0;
-}
-
-
 int RtmpEfuseSupportCheck(
        IN RTMP_ADAPTER *pAd)
 {

diff --git a/drivers/staging/rt2860/common/ee_prom.c b/drivers/staging/rt2860/common/ee_prom.c
index 9ebff8b9e568c3756f482f30297df332cb2a20f4..d600e9b829a0c3ab2813d20ddb46a0d58f086a61 100644 (file)
--- a/drivers/staging/rt2860/common/ee_prom.c
+++ b/drivers/staging/rt2860/common/ee_prom.c
@@ -220,51 +220,3 @@ int rtmp_ee_prom_read16(
 
        return NDIS_STATUS_SUCCESS;
 }
-
-
-int rtmp_ee_prom_write16(
-    IN  PRTMP_ADAPTER  pAd,
-    IN  USHORT Offset,
-    IN  USHORT Data)
-{
-       UINT32 x;
-
-
-       Offset /= 2;
-
-       EWEN(pAd);
-
-       // reset bits and set EECS
-       RTMP_IO_READ32(pAd, E2PROM_CSR, &x);
-       x &= ~(EEDI | EEDO | EESK);
-       x |= EECS;
-       RTMP_IO_WRITE32(pAd, E2PROM_CSR, x);
-
-       // patch can not access e-Fuse issue
-       if (!(IS_RT3090(pAd) || IS_RT3572(pAd) || IS_RT3390(pAd)))
-       {
-               // kick a pulse
-               RaiseClock(pAd, &x);
-               LowerClock(pAd, &x);
-       }
-
-       // output the read_opcode ,register number and data in that order
-       ShiftOutBits(pAd, EEPROM_WRITE_OPCODE, 3);
-       ShiftOutBits(pAd, Offset, pAd->EEPROMAddressNum);
-       ShiftOutBits(pAd, Data, 16);            // 16-bit access
-
-       // read DO status
-       RTMP_IO_READ32(pAd, E2PROM_CSR, &x);
-
-       EEpromCleanup(pAd);
-
-       RTMPusecDelay(10000);   //delay for twp(MAX)=10ms
-
-       EWDS(pAd);
-
-       EEpromCleanup(pAd);
-
-
-       return NDIS_STATUS_SUCCESS;
-
-}

diff --git a/drivers/staging/rt2860/common/eeprom.c b/drivers/staging/rt2860/common/eeprom.c
index 03b8454bf74fb5424d39462f104fb0625af03fc8..d7a2664bb73a932e0fc444b723df8b757c58009e 100644 (file)
--- a/drivers/staging/rt2860/common/eeprom.c
+++ b/drivers/staging/rt2860/common/eeprom.c
@@ -66,7 +66,6 @@ INT RtmpChipOpsEepromHook(
                        {
                pChipOps->eeinit = eFuse_init;
                pChipOps->eeread = rtmp_ee_efuse_read16;
-               pChipOps->eewrite = rtmp_ee_efuse_write16;
                return 0 ;
             }
                else
@@ -83,14 +82,12 @@ INT RtmpChipOpsEepromHook(
                case RTMP_DEV_INF_PCI:
                        pChipOps->eeinit = NULL;
                        pChipOps->eeread = rtmp_ee_prom_read16;
-                       pChipOps->eewrite = rtmp_ee_prom_write16;
                                        break;
 #endif // RTMP_PCI_SUPPORT //
 #ifdef RTMP_USB_SUPPORT
                case RTMP_DEV_INF_USB:
                        pChipOps->eeinit = NULL;
                        pChipOps->eeread = RTUSBReadEEPROM16;
-                       pChipOps->eewrite = RTUSBWriteEEPROM16;
                                        break;
 #endif // RTMP_USB_SUPPORT //
 

diff --git a/drivers/staging/rt2860/eeprom.h b/drivers/staging/rt2860/eeprom.h
index f1aef0c17b00b7a08f1be9acc0f2c6d109dd180e..9979fef97b02403ae87ab95d710e728fe965d357 100644 (file)
--- a/drivers/staging/rt2860/eeprom.h
+++ b/drivers/staging/rt2860/eeprom.h
@@ -48,11 +48,6 @@ int rtmp_ee_prom_read16(
        IN PRTMP_ADAPTER        pAd,
        IN USHORT                       Offset,
        OUT USHORT                      *pValue);
-
-int rtmp_ee_prom_write16(
-       IN PRTMP_ADAPTER        pAd,
-       IN USHORT                       Offset,
-       IN USHORT                       value);
 #endif // RTMP_PCI_SUPPORT //
 #ifdef RTMP_USB_SUPPORT
 /*************************************************************************
@@ -62,11 +57,6 @@ NTSTATUS RTUSBReadEEPROM16(
        IN PRTMP_ADAPTER        pAd,
        IN      USHORT                  offset,
        OUT     PUSHORT                 pData);
-
-NTSTATUS RTUSBWriteEEPROM16(
-       IN RTMP_ADAPTER *pAd,
-       IN USHORT offset,
-       IN USHORT value);
 #endif // RTMP_USB_SUPPORT //
 
 #ifdef RT30xx
@@ -75,11 +65,6 @@ int rtmp_ee_efuse_read16(
        IN RTMP_ADAPTER *pAd,
        IN USHORT Offset,
        OUT USHORT *pValue);
-
-int rtmp_ee_efuse_write16(
-       IN RTMP_ADAPTER *pAd,
-       IN USHORT Offset,
-       IN USHORT data);
 #endif // RTMP_EFUSE_SUPPORT //
 #endif // RT30xx //
 

diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index 12b14654e67ec089e9cbcbd5fd0e3dba9801c4cb..3e284f241fc205e14b3fa26e8ed855fbc1823d6d 100644 (file)
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -1790,7 +1790,6 @@ struct _RTMP_CHIP_OP_
        /*  Calibration access related callback functions */
        int (*eeinit)(RTMP_ADAPTER *pAd);                                                                               /* int (*eeinit)(RTMP_ADAPTER *pAd); */
        int (*eeread)(RTMP_ADAPTER *pAd, USHORT offset, PUSHORT pValue);                                /* int (*eeread)(RTMP_ADAPTER *pAd, int offset, PUSHORT pValue); */
-       int (*eewrite)(RTMP_ADAPTER *pAd, USHORT offset, USHORT value);;                                /* int (*eewrite)(RTMP_ADAPTER *pAd, int offset, USHORT value); */
 
        /* MCU related callback functions */
        int (*loadFirmware)(RTMP_ADAPTER *pAd);                                                         /* int (*loadFirmware)(RTMP_ADAPTER *pAd); */

diff --git a/drivers/staging/rt2860/rtmp_chip.h b/drivers/staging/rt2860/rtmp_chip.h
index 1284a446786ed800dc4f0731a1f53913ab17f130..1098a8547d9dcf94a85774cfe80e39018a3477c7 100644 (file)
--- a/drivers/staging/rt2860/rtmp_chip.h
+++ b/drivers/staging/rt2860/rtmp_chip.h
@@ -167,10 +167,6 @@
 #define RT28xx_EEPROM_READ16(_pAd, _offset, _value)                    \
        (_pAd)->chipOps.eeread((RTMP_ADAPTER *)(_pAd), (USHORT)(_offset), (PUSHORT)&(_value))
 
-#define RT28xx_EEPROM_WRITE16(_pAd, _offset, _value)           \
-       (_pAd)->chipOps.eewrite((RTMP_ADAPTER *)(_pAd), (USHORT)(_offset), (USHORT)(_value))
-
-
 
 // -------------------------------------------------------------------
 //  E2PROM data layout

diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
index a93fde5e5725498128cfca4e738afba24ad2e843..b01a24ac251ce6117147872c7303cfa1eb275433 100644 (file)
--- a/drivers/staging/rt2870/common/rtusb_io.c
+++ b/drivers/staging/rt2870/common/rtusb_io.c
@@ -619,17 +619,6 @@ NTSTATUS RTUSBReadEEPROM16(
 
 }
 
-NTSTATUS RTUSBWriteEEPROM16(
-       IN RTMP_ADAPTER *pAd,
-       IN USHORT offset,
-       IN USHORT value)
-{
-       USHORT tmpVal;
-
-       tmpVal = cpu2le16(value);
-       return RTUSBWriteEEPROM(pAd, offset, (PUCHAR)&(tmpVal), 2);
-}
-
 /*
        ========================================================================