Merge branch 'tc1100-wmi' into release

[deliverable/linux.git] / drivers / staging / rt2860 / common / eeprom.c

diff --git a/drivers/staging/rt2860/common/eeprom.c b/drivers/staging/rt2860/common/eeprom.c
index 872b47c10b7f6dee854d335ce3b1a35509a3b327..94670076d32ba0ec2cf13cc4a798cde3362962db 100644 (file)
--- a/drivers/staging/rt2860/common/eeprom.c
+++ b/drivers/staging/rt2860/common/eeprom.c
@@ -36,12 +36,12 @@
 */
 #include "../rt_config.h"
 
-INT RtmpChipOpsEepromHook(IN RTMP_ADAPTER * pAd, IN INT infType)
+int RtmpChipOpsEepromHook(struct rt_rtmp_adapter *pAd, int infType)
 {
-       RTMP_CHIP_OP *pChipOps = &pAd->chipOps;
+       struct rt_rtmp_chip_op *pChipOps = &pAd->chipOps;
 #ifdef RT30xx
 #ifdef RTMP_EFUSE_SUPPORT
-       UINT32 eFuseCtrl, MacCsr0;
+       u32 eFuseCtrl, MacCsr0;
        int index;
 
        index = 0;
@@ -65,8 +65,8 @@ INT RtmpChipOpsEepromHook(IN RTMP_ADAPTER * pAd, IN INT infType)
                return 0;
        } else
                DBGPRINT(RT_DEBUG_TRACE, ("NVM is EEPROM\n"));
-#endif // RTMP_EFUSE_SUPPORT //
-#endif // RT30xx //
+#endif /* RTMP_EFUSE_SUPPORT // */
+#endif /* RT30xx // */
 
        switch (infType) {
 #ifdef RTMP_PCI_SUPPORT
@@ -74,13 +74,13 @@ INT RtmpChipOpsEepromHook(IN RTMP_ADAPTER * pAd, IN INT infType)
                pChipOps->eeinit = NULL;
                pChipOps->eeread = rtmp_ee_prom_read16;
                break;
-#endif // RTMP_PCI_SUPPORT //
+#endif /* RTMP_PCI_SUPPORT // */
 #ifdef RTMP_USB_SUPPORT
        case RTMP_DEV_INF_USB:
                pChipOps->eeinit = NULL;
                pChipOps->eeread = RTUSBReadEEPROM16;
                break;
-#endif // RTMP_USB_SUPPORT //
+#endif /* RTMP_USB_SUPPORT // */
 
        default:
                DBGPRINT(RT_DEBUG_ERROR, ("RtmpChipOpsEepromHook() failed!\n"));