aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2009-01-07 17:31:57 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 18:48:54 -0500
commitd599edcaea987e233fad808f88850f725e8a5530 (patch)
tree5e9336d4882232ae7296355cd2d21ed0aff86f8f
parent9b4778f680aa79d838ae2be6ab958938f744ce5f (diff)
staging: __FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat
-rw-r--r--drivers/staging/comedi/drivers.c2
-rw-r--r--drivers/staging/epl/Edrv8139.c60
-rw-r--r--drivers/staging/epl/EplSdoAsySequ.c2
-rw-r--r--drivers/staging/frontier/alphatrack.c12
-rw-r--r--drivers/staging/frontier/tranzport.c22
-rw-r--r--drivers/staging/meilhaus/me0600_ext_irq.c4
-rw-r--r--drivers/staging/meilhaus/me1400_ext_irq.c2
-rw-r--r--drivers/staging/meilhaus/me1600_ao.c4
-rw-r--r--drivers/staging/meilhaus/me4600_ai.c8
-rw-r--r--drivers/staging/meilhaus/me4600_ao.c6
-rw-r--r--drivers/staging/meilhaus/me4600_ext_irq.c2
-rw-r--r--drivers/staging/meilhaus/me6000_ao.c20
-rw-r--r--drivers/staging/meilhaus/me8100_di.c6
-rw-r--r--drivers/staging/meilhaus/me8200_di.c4
-rw-r--r--drivers/staging/meilhaus/me8200_do.c2
-rw-r--r--drivers/staging/meilhaus/medebug.h10
-rw-r--r--drivers/staging/otus/80211core/cagg.c2
-rw-r--r--drivers/staging/otus/80211core/pub_zfw.h2
-rw-r--r--drivers/staging/otus/80211core/struct.h2
-rw-r--r--drivers/staging/otus/oal_marc.h12
-rw-r--r--drivers/staging/rt2860/2860_main_dev.c2
-rw-r--r--drivers/staging/rt2860/common/ba_action.c18
-rw-r--r--drivers/staging/rt2860/common/cmm_data.c2
-rw-r--r--drivers/staging/rt2860/common/cmm_data_2860.c6
-rw-r--r--drivers/staging/rt2860/common/cmm_info.c2
-rw-r--r--drivers/staging/rt2860/common/dfs.c4
-rw-r--r--drivers/staging/rt2860/common/rtmp_init.c18
-rw-r--r--drivers/staging/rt2860/common/spectrum.c44
-rw-r--r--drivers/staging/rt2860/rt_ate.c32
-rw-r--r--drivers/staging/rt2860/rt_linux.c18
-rw-r--r--drivers/staging/rt2860/rt_linux.h2
-rw-r--r--drivers/staging/rt2860/rt_profile.c12
-rw-r--r--drivers/staging/rt2860/rtmp_def.h2
-rw-r--r--drivers/staging/rt2860/sta_ioctl.c36
-rw-r--r--drivers/staging/rt2870/2870_main_dev.c6
-rw-r--r--drivers/staging/rt2870/common/2870_rtmp_init.c4
-rw-r--r--drivers/staging/rt2870/common/ba_action.c18
-rw-r--r--drivers/staging/rt2870/common/cmm_data.c2
-rw-r--r--drivers/staging/rt2870/common/cmm_info.c2
-rw-r--r--drivers/staging/rt2870/common/dfs.c4
-rw-r--r--drivers/staging/rt2870/common/rtmp_init.c20
-rw-r--r--drivers/staging/rt2870/common/rtusb_bulk.c4
-rw-r--r--drivers/staging/rt2870/common/spectrum.c44
-rw-r--r--drivers/staging/rt2870/rt_ate.c30
-rw-r--r--drivers/staging/rt2870/rt_linux.c18
-rw-r--r--drivers/staging/rt2870/rt_linux.h2
-rw-r--r--drivers/staging/rt2870/rt_main_dev.c2
-rw-r--r--drivers/staging/rt2870/rt_profile.c12
-rw-r--r--drivers/staging/rt2870/rtmp_def.h2
-rw-r--r--drivers/staging/rt2870/sta_ioctl.c36
-rw-r--r--drivers/staging/rt2870/tmp6036
-rw-r--r--drivers/staging/rt2870/tmp6136
-rw-r--r--drivers/staging/rtl8187se/ieee80211.h2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211.h2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c8
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c2
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c8
-rw-r--r--drivers/staging/rtl8187se/r8180_core.c12
-rw-r--r--drivers/staging/rtl8187se/r8180_rtl8225z2.c4
-rw-r--r--drivers/staging/rtl8187se/r8180_wx.c14
64 files changed, 360 insertions, 360 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 06372b227bb2..36a93b95e3f2 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -557,7 +557,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)
557 block_size = num_bytes - count; 557 block_size = num_bytes - count;
558 if (block_size < 0) { 558 if (block_size < 0) {
559 rt_printk("%s: %s: bug! block_size is negative\n", 559 rt_printk("%s: %s: bug! block_size is negative\n",
560 __FILE__, __FUNCTION__); 560 __FILE__, __func__);
561 break; 561 break;
562 } 562 }
563 if ((int)(async->munge_ptr + block_size - 563 if ((int)(async->munge_ptr + block_size -
diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c
index 88ab4a4f1023..296354aaa9c7 100644
--- a/drivers/staging/epl/Edrv8139.c
+++ b/drivers/staging/epl/Edrv8139.c
@@ -391,19 +391,19 @@ tEplKernel EdrvInit(tEdrvInitParam * pEdrvInitParam_p)
391 // register PCI driver 391 // register PCI driver
392 iResult = pci_register_driver(&EdrvDriver); 392 iResult = pci_register_driver(&EdrvDriver);
393 if (iResult != 0) { 393 if (iResult != 0) {
394 printk("%s pci_register_driver failed with %d\n", __FUNCTION__, 394 printk("%s pci_register_driver failed with %d\n", __func__,
395 iResult); 395 iResult);
396 Ret = kEplNoResource; 396 Ret = kEplNoResource;
397 goto Exit; 397 goto Exit;
398 } 398 }
399 399
400 if (EdrvInstance_l.m_pPciDev == NULL) { 400 if (EdrvInstance_l.m_pPciDev == NULL) {
401 printk("%s m_pPciDev=NULL\n", __FUNCTION__); 401 printk("%s m_pPciDev=NULL\n", __func__);
402 Ret = kEplNoResource; 402 Ret = kEplNoResource;
403 goto Exit; 403 goto Exit;
404 } 404 }
405 // read MAC address from controller 405 // read MAC address from controller
406 printk("%s local MAC = ", __FUNCTION__); 406 printk("%s local MAC = ", __func__);
407 for (iResult = 0; iResult < 6; iResult++) { 407 for (iResult = 0; iResult < 6; iResult++) {
408 pEdrvInitParam_p->m_abMyMacAddr[iResult] = 408 pEdrvInitParam_p->m_abMyMacAddr[iResult] =
409 EDRV_REGB_READ((EDRV_REGDW_IDR0 + iResult)); 409 EDRV_REGB_READ((EDRV_REGDW_IDR0 + iResult));
@@ -434,7 +434,7 @@ tEplKernel EdrvShutdown(void)
434{ 434{
435 435
436 // unregister PCI driver 436 // unregister PCI driver
437 printk("%s calling pci_unregister_driver()\n", __FUNCTION__); 437 printk("%s calling pci_unregister_driver()\n", __func__);
438 pci_unregister_driver(&EdrvDriver); 438 pci_unregister_driver(&EdrvDriver);
439 439
440 return kEplSuccessful; 440 return kEplSuccessful;
@@ -621,7 +621,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p)
621 EDRV_REGDW_READ((EDRV_REGDW_TSD0 + 621 EDRV_REGDW_READ((EDRV_REGDW_TSD0 +
622 (EdrvInstance_l.m_uiCurTxDesc * 622 (EdrvInstance_l.m_uiCurTxDesc *
623 sizeof(DWORD)))); 623 sizeof(DWORD))));
624 printk("%s InvOp TSD%u = 0x%08lX", __FUNCTION__, 624 printk("%s InvOp TSD%u = 0x%08lX", __func__,
625 EdrvInstance_l.m_uiCurTxDesc, dwTemp); 625 EdrvInstance_l.m_uiCurTxDesc, dwTemp);
626 printk(" Cmd = 0x%02X\n", 626 printk(" Cmd = 0x%02X\n",
627 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); 627 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND));
@@ -646,7 +646,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p)
646 dwTemp = 646 dwTemp =
647 EDRV_REGDW_READ((EDRV_REGDW_TSAD0 + 647 EDRV_REGDW_READ((EDRV_REGDW_TSAD0 +
648 (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD)))); 648 (EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))));
649// printk("%s TSAD%u = 0x%08lX", __FUNCTION__, EdrvInstance_l.m_uiCurTxDesc, dwTemp); 649// printk("%s TSAD%u = 0x%08lX", __func__, EdrvInstance_l.m_uiCurTxDesc, dwTemp);
650 650
651 // start transmission 651 // start transmission
652 EDRV_REGDW_WRITE((EDRV_REGDW_TSD0 + 652 EDRV_REGDW_WRITE((EDRV_REGDW_TSD0 +
@@ -786,7 +786,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p,
786 786
787 if (EdrvInstance_l.m_pbTxBuf == NULL) { 787 if (EdrvInstance_l.m_pbTxBuf == NULL) {
788 printk("%s Tx buffers currently not allocated\n", 788 printk("%s Tx buffers currently not allocated\n",
789 __FUNCTION__); 789 __func__);
790 goto Exit; 790 goto Exit;
791 } 791 }
792 // read transmit status 792 // read transmit status
@@ -842,7 +842,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p,
842 842
843 if (EdrvInstance_l.m_pbRxBuf == NULL) { 843 if (EdrvInstance_l.m_pbRxBuf == NULL) {
844 printk("%s Rx buffers currently not allocated\n", 844 printk("%s Rx buffers currently not allocated\n",
845 __FUNCTION__); 845 __func__);
846 goto Exit; 846 goto Exit;
847 } 847 }
848 // read current offset in receive buffer 848 // read current offset in receive buffer
@@ -944,7 +944,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
944 DWORD dwTemp; 944 DWORD dwTemp;
945 945
946 if (EdrvInstance_l.m_pPciDev != NULL) { // Edrv is already connected to a PCI device 946 if (EdrvInstance_l.m_pPciDev != NULL) { // Edrv is already connected to a PCI device
947 printk("%s device %s discarded\n", __FUNCTION__, 947 printk("%s device %s discarded\n", __func__,
948 pci_name(pPciDev)); 948 pci_name(pPciDev));
949 iResult = -ENODEV; 949 iResult = -ENODEV;
950 goto Exit; 950 goto Exit;
@@ -953,7 +953,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
953 if (pPciDev->revision >= 0x20) { 953 if (pPciDev->revision >= 0x20) {
954 printk 954 printk
955 ("%s device %s is an enhanced 8139C+ version, which is not supported\n", 955 ("%s device %s is an enhanced 8139C+ version, which is not supported\n",
956 __FUNCTION__, pci_name(pPciDev)); 956 __func__, pci_name(pPciDev));
957 iResult = -ENODEV; 957 iResult = -ENODEV;
958 goto Exit; 958 goto Exit;
959 } 959 }
@@ -961,7 +961,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
961 EdrvInstance_l.m_pPciDev = pPciDev; 961 EdrvInstance_l.m_pPciDev = pPciDev;
962 962
963 // enable device 963 // enable device
964 printk("%s enable device\n", __FUNCTION__); 964 printk("%s enable device\n", __func__);
965 iResult = pci_enable_device(pPciDev); 965 iResult = pci_enable_device(pPciDev);
966 if (iResult != 0) { 966 if (iResult != 0) {
967 goto Exit; 967 goto Exit;
@@ -972,13 +972,13 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
972 goto Exit; 972 goto Exit;
973 } 973 }
974 974
975 printk("%s request regions\n", __FUNCTION__); 975 printk("%s request regions\n", __func__);
976 iResult = pci_request_regions(pPciDev, DRV_NAME); 976 iResult = pci_request_regions(pPciDev, DRV_NAME);
977 if (iResult != 0) { 977 if (iResult != 0) {
978 goto Exit; 978 goto Exit;
979 } 979 }
980 980
981 printk("%s ioremap\n", __FUNCTION__); 981 printk("%s ioremap\n", __func__);
982 EdrvInstance_l.m_pIoAddr = 982 EdrvInstance_l.m_pIoAddr =
983 ioremap(pci_resource_start(pPciDev, 1), 983 ioremap(pci_resource_start(pPciDev, 1),
984 pci_resource_len(pPciDev, 1)); 984 pci_resource_len(pPciDev, 1));
@@ -987,11 +987,11 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
987 goto Exit; 987 goto Exit;
988 } 988 }
989 // enable PCI busmaster 989 // enable PCI busmaster
990 printk("%s enable busmaster\n", __FUNCTION__); 990 printk("%s enable busmaster\n", __func__);
991 pci_set_master(pPciDev); 991 pci_set_master(pPciDev);
992 992
993 // reset controller 993 // reset controller
994 printk("%s reset controller\n", __FUNCTION__); 994 printk("%s reset controller\n", __func__);
995 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, EDRV_REGB_COMMAND_RST); 995 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, EDRV_REGB_COMMAND_RST);
996 996
997 // wait until reset has finished 997 // wait until reset has finished
@@ -1008,20 +1008,20 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1008 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TCR); 1008 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TCR);
1009 if (((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_C) 1009 if (((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_C)
1010 && ((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_D)) { // unsupported chip 1010 && ((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_D)) { // unsupported chip
1011 printk("%s Unsupported chip! TCR = 0x%08lX\n", __FUNCTION__, 1011 printk("%s Unsupported chip! TCR = 0x%08lX\n", __func__,
1012 dwTemp); 1012 dwTemp);
1013 iResult = -ENODEV; 1013 iResult = -ENODEV;
1014 goto Exit; 1014 goto Exit;
1015 } 1015 }
1016 // disable interrupts 1016 // disable interrupts
1017 printk("%s disable interrupts\n", __FUNCTION__); 1017 printk("%s disable interrupts\n", __func__);
1018 EDRV_REGW_WRITE(EDRV_REGW_INT_MASK, 0); 1018 EDRV_REGW_WRITE(EDRV_REGW_INT_MASK, 0);
1019 // acknowledge all pending interrupts 1019 // acknowledge all pending interrupts
1020 EDRV_REGW_WRITE(EDRV_REGW_INT_STATUS, 1020 EDRV_REGW_WRITE(EDRV_REGW_INT_STATUS,
1021 EDRV_REGW_READ(EDRV_REGW_INT_STATUS)); 1021 EDRV_REGW_READ(EDRV_REGW_INT_STATUS));
1022 1022
1023 // install interrupt handler 1023 // install interrupt handler
1024 printk("%s install interrupt handler\n", __FUNCTION__); 1024 printk("%s install interrupt handler\n", __func__);
1025 iResult = 1025 iResult =
1026 request_irq(pPciDev->irq, TgtEthIsr, IRQF_SHARED, 1026 request_irq(pPciDev->irq, TgtEthIsr, IRQF_SHARED,
1027 DRV_NAME /*pPciDev->dev.name */ , pPciDev); 1027 DRV_NAME /*pPciDev->dev.name */ , pPciDev);
@@ -1031,16 +1031,16 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1031 1031
1032/* 1032/*
1033 // unlock configuration registers 1033 // unlock configuration registers
1034 printk("%s unlock configuration registers\n", __FUNCTION__); 1034 printk("%s unlock configuration registers\n", __func__);
1035 EDRV_REGB_WRITE(EDRV_REGB_CMD9346, EDRV_REGB_CMD9346_UNLOCK); 1035 EDRV_REGB_WRITE(EDRV_REGB_CMD9346, EDRV_REGB_CMD9346_UNLOCK);
1036 1036
1037 // check if user specified a MAC address 1037 // check if user specified a MAC address
1038 printk("%s check specified MAC address\n", __FUNCTION__); 1038 printk("%s check specified MAC address\n", __func__);
1039 for (iResult = 0; iResult < 6; iResult++) 1039 for (iResult = 0; iResult < 6; iResult++)
1040 { 1040 {
1041 if (EdrvInstance_l.m_InitParam.m_abMyMacAddr[iResult] != 0) 1041 if (EdrvInstance_l.m_InitParam.m_abMyMacAddr[iResult] != 0)
1042 { 1042 {
1043 printk("%s set local MAC address\n", __FUNCTION__); 1043 printk("%s set local MAC address\n", __func__);
1044 // write this MAC address to controller 1044 // write this MAC address to controller
1045 EDRV_REGDW_WRITE(EDRV_REGDW_IDR0, 1045 EDRV_REGDW_WRITE(EDRV_REGDW_IDR0,
1046 le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0]))); 1046 le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0])));
@@ -1059,7 +1059,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1059*/ 1059*/
1060 1060
1061 // allocate buffers 1061 // allocate buffers
1062 printk("%s allocate buffers\n", __FUNCTION__); 1062 printk("%s allocate buffers\n", __func__);
1063 EdrvInstance_l.m_pbTxBuf = 1063 EdrvInstance_l.m_pbTxBuf =
1064 pci_alloc_consistent(pPciDev, EDRV_TX_BUFFER_SIZE, 1064 pci_alloc_consistent(pPciDev, EDRV_TX_BUFFER_SIZE,
1065 &EdrvInstance_l.m_pTxBufDma); 1065 &EdrvInstance_l.m_pTxBufDma);
@@ -1076,7 +1076,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1076 goto Exit; 1076 goto Exit;
1077 } 1077 }
1078 // reset pointers for Tx buffers 1078 // reset pointers for Tx buffers
1079 printk("%s reset pointers fo Tx buffers\n", __FUNCTION__); 1079 printk("%s reset pointers fo Tx buffers\n", __func__);
1080 EDRV_REGDW_WRITE(EDRV_REGDW_TSAD0, 0); 1080 EDRV_REGDW_WRITE(EDRV_REGDW_TSAD0, 0);
1081 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TSAD0); 1081 dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TSAD0);
1082 EDRV_REGDW_WRITE(EDRV_REGDW_TSAD1, 0); 1082 EDRV_REGDW_WRITE(EDRV_REGDW_TSAD1, 0);
@@ -1090,11 +1090,11 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1090 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); 1090 (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND));
1091 1091
1092 // set pointer for receive buffer in controller 1092 // set pointer for receive buffer in controller
1093 printk("%s set pointer to Rx buffer\n", __FUNCTION__); 1093 printk("%s set pointer to Rx buffer\n", __func__);
1094 EDRV_REGDW_WRITE(EDRV_REGDW_RBSTART, EdrvInstance_l.m_pRxBufDma); 1094 EDRV_REGDW_WRITE(EDRV_REGDW_RBSTART, EdrvInstance_l.m_pRxBufDma);
1095 1095
1096 // enable transmitter and receiver 1096 // enable transmitter and receiver
1097 printk("%s enable Tx and Rx", __FUNCTION__); 1097 printk("%s enable Tx and Rx", __func__);
1098 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, 1098 EDRV_REGB_WRITE(EDRV_REGB_COMMAND,
1099 (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE)); 1099 (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE));
1100 printk(" Command = 0x%02X\n", 1100 printk(" Command = 0x%02X\n",
@@ -1104,12 +1104,12 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1104 EDRV_REGDW_WRITE(EDRV_REGDW_MPC, 0); 1104 EDRV_REGDW_WRITE(EDRV_REGDW_MPC, 0);
1105 1105
1106 // set transmit configuration register 1106 // set transmit configuration register
1107 printk("%s set Tx conf register", __FUNCTION__); 1107 printk("%s set Tx conf register", __func__);
1108 EDRV_REGDW_WRITE(EDRV_REGDW_TCR, EDRV_REGDW_TCR_DEF); 1108 EDRV_REGDW_WRITE(EDRV_REGDW_TCR, EDRV_REGDW_TCR_DEF);
1109 printk(" = 0x%08X\n", EDRV_REGDW_READ(EDRV_REGDW_TCR)); 1109 printk(" = 0x%08X\n", EDRV_REGDW_READ(EDRV_REGDW_TCR));
1110 1110
1111 // set receive configuration register 1111 // set receive configuration register
1112 printk("%s set Rx conf register", __FUNCTION__); 1112 printk("%s set Rx conf register", __func__);
1113 EDRV_REGDW_WRITE(EDRV_REGDW_RCR, EDRV_REGDW_RCR_DEF); 1113 EDRV_REGDW_WRITE(EDRV_REGDW_RCR, EDRV_REGDW_RCR_DEF);
1114 printk(" = 0x%08X\n", EDRV_REGDW_READ(EDRV_REGDW_RCR)); 1114 printk(" = 0x%08X\n", EDRV_REGDW_READ(EDRV_REGDW_RCR));
1115 1115
@@ -1121,7 +1121,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1121 1121
1122/* 1122/*
1123 // enable transmitter and receiver 1123 // enable transmitter and receiver
1124 printk("%s enable Tx and Rx", __FUNCTION__); 1124 printk("%s enable Tx and Rx", __func__);
1125 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE)); 1125 EDRV_REGB_WRITE(EDRV_REGB_COMMAND, (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE));
1126 printk(" Command = 0x%02X\n", (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND)); 1126 printk(" Command = 0x%02X\n", (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND));
1127*/ 1127*/
@@ -1129,11 +1129,11 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
1129 EDRV_REGW_WRITE(EDRV_REGW_MULINT, 0); 1129 EDRV_REGW_WRITE(EDRV_REGW_MULINT, 0);
1130 1130
1131 // enable interrupts 1131 // enable interrupts
1132 printk("%s enable interrupts\n", __FUNCTION__); 1132 printk("%s enable interrupts\n", __func__);
1133 EDRV_REGW_WRITE(EDRV_REGW_INT_MASK, EDRV_REGW_INT_MASK_DEF); 1133 EDRV_REGW_WRITE(EDRV_REGW_INT_MASK, EDRV_REGW_INT_MASK_DEF);
1134 1134
1135 Exit: 1135 Exit:
1136 printk("%s finished with %d\n", __FUNCTION__, iResult); 1136 printk("%s finished with %d\n", __func__, iResult);
1137 return iResult; 1137 return iResult;
1138} 1138}
1139 1139
diff --git a/drivers/staging/epl/EplSdoAsySequ.c b/drivers/staging/epl/EplSdoAsySequ.c
index 991c6be880c0..6b6a9975d78b 100644
--- a/drivers/staging/epl/EplSdoAsySequ.c
+++ b/drivers/staging/epl/EplSdoAsySequ.c
@@ -876,7 +876,7 @@ static tEplKernel EplSdoAsySeqProcess(unsigned int uiHandle_p,
876 { 876 {
877/* 877/*
878 PRINTF3("%s scon=%u rcon=%u\n", 878 PRINTF3("%s scon=%u rcon=%u\n",
879 __FUNCTION__, 879 __func__,
880 pRecFrame_p->m_le_bSendSeqNumCon, 880 pRecFrame_p->m_le_bSendSeqNumCon,
881 pRecFrame_p->m_le_bRecSeqNumCon); 881 pRecFrame_p->m_le_bRecSeqNumCon);
882*/ 882*/
diff --git a/drivers/staging/frontier/alphatrack.c b/drivers/staging/frontier/alphatrack.c
index 61d7c5df87af..6136e3f8762d 100644
--- a/drivers/staging/frontier/alphatrack.c
+++ b/drivers/staging/frontier/alphatrack.c
@@ -239,7 +239,7 @@ static void usb_alphatrack_interrupt_in_callback(struct urb *urb)
239 goto exit; 239 goto exit;
240 } else { 240 } else {
241 dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", 241 dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n",
242 __FUNCTION__, urb->status); 242 __func__, urb->status);
243 goto resubmit; /* maybe we can recover */ 243 goto resubmit; /* maybe we can recover */
244 } 244 }
245 } 245 }
@@ -261,7 +261,7 @@ static void usb_alphatrack_interrupt_in_callback(struct urb *urb)
261 if(dev->offline > 0 && dev->interrupt_in_buffer[1] != 0xff) { dev->offline = 0; } 261 if(dev->offline > 0 && dev->interrupt_in_buffer[1] != 0xff) { dev->offline = 0; }
262 if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; } 262 if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; }
263#endif 263#endif
264 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail); 264 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail);
265 next_ring_head = (dev->ring_head+1) % ring_buffer_size; 265 next_ring_head = (dev->ring_head+1) % ring_buffer_size;
266 266
267 if (next_ring_head != dev->ring_tail) { 267 if (next_ring_head != dev->ring_tail) {
@@ -305,7 +305,7 @@ static void usb_alphatrack_interrupt_out_callback(struct urb *urb)
305 urb->status == -ESHUTDOWN)) 305 urb->status == -ESHUTDOWN))
306 dbg_info(&dev->intf->dev, 306 dbg_info(&dev->intf->dev,
307 "%s - nonzero write interrupt status received: %d\n", 307 "%s - nonzero write interrupt status received: %d\n",
308 __FUNCTION__, urb->status); 308 __func__, urb->status);
309 atomic_dec(&dev->writes_pending); 309 atomic_dec(&dev->writes_pending);
310 dev->interrupt_out_busy = 0; 310 dev->interrupt_out_busy = 0;
311 wake_up_interruptible(&dev->write_wait); 311 wake_up_interruptible(&dev->write_wait);
@@ -330,7 +330,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)
330 330
331 if (!interface) { 331 if (!interface) {
332 err("%s - error, can't find device for minor %d\n", 332 err("%s - error, can't find device for minor %d\n",
333 __FUNCTION__, subminor); 333 __func__, subminor);
334 retval = -ENODEV; 334 retval = -ENODEV;
335 goto unlock_disconnect_exit; 335 goto unlock_disconnect_exit;
336 } 336 }
@@ -514,7 +514,7 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer, size_
514 } 514 }
515 dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size; 515 dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size;
516 c+=INPUT_CMD_SIZE; 516 c+=INPUT_CMD_SIZE;
517 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail); 517 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail);
518 } 518 }
519 retval = c; 519 retval = c;
520 520
@@ -573,7 +573,7 @@ static ssize_t usb_alphatrack_write(struct file *file, const char __user *buffer
573 if (bytes_to_write < count) 573 if (bytes_to_write < count)
574 dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write); 574 dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write);
575 575
576 dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __FUNCTION__, count, bytes_to_write); 576 dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __func__, count, bytes_to_write);
577 577
578 if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) { 578 if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) {
579 retval = -EFAULT; 579 retval = -EFAULT;
diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index 275faa762388..79abb6b16f74 100644
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -335,7 +335,7 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb)
335 goto exit; 335 goto exit;
336 } else { 336 } else {
337 dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n", 337 dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n",
338 __FUNCTION__, urb->status); 338 __func__, urb->status);
339 goto resubmit; /* maybe we can recover */ 339 goto resubmit; /* maybe we can recover */
340 } 340 }
341 } 341 }
@@ -345,7 +345,7 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb)
345 "Urb length was %d bytes!! Do something intelligent \n", urb->actual_length); 345 "Urb length was %d bytes!! Do something intelligent \n", urb->actual_length);
346 } else { 346 } else {
347 dbg_info(&dev->intf->dev, "%s: received: %02x%02x%02x%02x%02x%02x%02x%02x\n", 347 dbg_info(&dev->intf->dev, "%s: received: %02x%02x%02x%02x%02x%02x%02x%02x\n",
348 __FUNCTION__, dev->interrupt_in_buffer[0],dev->interrupt_in_buffer[1],dev->interrupt_in_buffer[2],dev->interrupt_in_buffer[3],dev->interrupt_in_buffer[4],dev->interrupt_in_buffer[5],dev->interrupt_in_buffer[6],dev->interrupt_in_buffer[7]); 348 __func__, dev->interrupt_in_buffer[0],dev->interrupt_in_buffer[1],dev->interrupt_in_buffer[2],dev->interrupt_in_buffer[3],dev->interrupt_in_buffer[4],dev->interrupt_in_buffer[5],dev->interrupt_in_buffer[6],dev->interrupt_in_buffer[7]);
349#if SUPPRESS_EXTRA_OFFLINE_EVENTS 349#if SUPPRESS_EXTRA_OFFLINE_EVENTS
350 if(dev->offline == 2 && dev->interrupt_in_buffer[1] == 0xff) { goto resubmit; } 350 if(dev->offline == 2 && dev->interrupt_in_buffer[1] == 0xff) { goto resubmit; }
351 if(dev->offline == 1 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 2; goto resubmit; } 351 if(dev->offline == 1 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 2; goto resubmit; }
@@ -355,7 +355,7 @@ static void usb_tranzport_interrupt_in_callback(struct urb *urb)
355 if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; } 355 if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; }
356 356
357#endif 357#endif
358 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail); 358 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail);
359 359
360 next_ring_head = (dev->ring_head+1) % ring_buffer_size; 360 next_ring_head = (dev->ring_head+1) % ring_buffer_size;
361 361
@@ -399,7 +399,7 @@ static void usb_tranzport_interrupt_out_callback(struct urb *urb)
399 urb->status == -ESHUTDOWN)) 399 urb->status == -ESHUTDOWN))
400 dbg_info(&dev->intf->dev, 400 dbg_info(&dev->intf->dev,
401 "%s - nonzero write interrupt status received: %d\n", 401 "%s - nonzero write interrupt status received: %d\n",
402 __FUNCTION__, urb->status); 402 __func__, urb->status);
403 403
404 dev->interrupt_out_busy = 0; 404 dev->interrupt_out_busy = 0;
405 wake_up_interruptible(&dev->write_wait); 405 wake_up_interruptible(&dev->write_wait);
@@ -424,7 +424,7 @@ static int usb_tranzport_open(struct inode *inode, struct file *file)
424 424
425 if (!interface) { 425 if (!interface) {
426 err("%s - error, can't find device for minor %d\n", 426 err("%s - error, can't find device for minor %d\n",
427 __FUNCTION__, subminor); 427 __func__, subminor);
428 retval = -ENODEV; 428 retval = -ENODEV;
429 goto unlock_disconnect_exit; 429 goto unlock_disconnect_exit;
430 } 430 }
@@ -613,7 +613,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
613 } 613 }
614 614
615 dbg_info(&dev->intf->dev, "%s: copying to userspace: %02x%02x%02x%02x%02x%02x%02x%02x\n", 615 dbg_info(&dev->intf->dev, "%s: copying to userspace: %02x%02x%02x%02x%02x%02x%02x%02x\n",
616 __FUNCTION__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]); 616 __func__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
617 617
618#if BUFFERED_READS 618#if BUFFERED_READS
619 c = 0; 619 c = 0;
@@ -632,7 +632,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
632 // FIXME the math is wrong for going in reverse, actually, as the midi spec doesn't allow signed chars 632 // FIXME the math is wrong for going in reverse, actually, as the midi spec doesn't allow signed chars
633 633
634 dbg_info(&dev->intf->dev, "%s: trying to compress: %02x%02x%02x%02x%02x %02x %02x %02x\n", 634 dbg_info(&dev->intf->dev, "%s: trying to compress: %02x%02x%02x%02x%02x %02x %02x %02x\n",
635 __FUNCTION__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]); 635 __func__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
636 636
637 637
638 if(((*dev->ring_buffer)[dev->ring_tail].cmd[6] != 0 && 638 if(((*dev->ring_buffer)[dev->ring_tail].cmd[6] != 0 &&
@@ -645,7 +645,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
645 ((*dev->ring_buffer)[dev->ring_tail].cmd[5] == (*dev->ring_buffer)[next_tail].cmd[5])) 645 ((*dev->ring_buffer)[dev->ring_tail].cmd[5] == (*dev->ring_buffer)[next_tail].cmd[5]))
646 { 646 {
647 dbg_info(&dev->intf->dev, "%s: should compress: %02x%02x%02x%02x%02x%02x%02x%02x\n", 647 dbg_info(&dev->intf->dev, "%s: should compress: %02x%02x%02x%02x%02x%02x%02x%02x\n",
648 __FUNCTION__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]); 648 __func__, (*dev->ring_buffer)[dev->ring_tail].cmd[0],(*dev->ring_buffer)[dev->ring_tail].cmd[1],(*dev->ring_buffer)[dev->ring_tail].cmd[2],(*dev->ring_buffer)[dev->ring_tail].cmd[3],(*dev->ring_buffer)[dev->ring_tail].cmd[4],(*dev->ring_buffer)[dev->ring_tail].cmd[5],(*dev->ring_buffer)[dev->ring_tail].cmd[6],(*dev->ring_buffer)[dev->ring_tail].cmd[7]);
649 649
650 newwheel += oldwheel; 650 newwheel += oldwheel;
651 if(oldwheel > 0 && !(newwheel > 0)) { 651 if(oldwheel > 0 && !(newwheel > 0)) {
@@ -673,7 +673,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
673 673
674 dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size; 674 dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size;
675 c+=8; 675 c+=8;
676 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail); 676 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail);
677 } 677 }
678 retval = c; 678 retval = c;
679 679
@@ -684,7 +684,7 @@ static ssize_t usb_tranzport_read(struct file *file, char __user *buffer, size_t
684 } 684 }
685 685
686 dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size; 686 dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size;
687 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail); 687 dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail);
688 688
689 retval = 8; 689 retval = 8;
690#endif /* BUFFERED_READS */ 690#endif /* BUFFERED_READS */
@@ -743,7 +743,7 @@ static ssize_t usb_tranzport_write(struct file *file, const char __user *buffer,
743 if (bytes_to_write < count) 743 if (bytes_to_write < count)
744 dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write); 744 dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write);
745 745
746 dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __FUNCTION__, count, bytes_to_write); 746 dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __func__, count, bytes_to_write);
747 747
748 if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) { 748 if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) {
749 retval = -EFAULT; 749 retval = -EFAULT;
diff --git a/drivers/staging/meilhaus/me0600_ext_irq.c b/drivers/staging/meilhaus/me0600_ext_irq.c
index a449ab200940..eba18adecb72 100644
--- a/drivers/staging/meilhaus/me0600_ext_irq.c
+++ b/drivers/staging/meilhaus/me0600_ext_irq.c
@@ -360,7 +360,7 @@ static irqreturn_t me0600_isr(int irq, void *dev_id, struct pt_regs *regs)
360 if (instance->lintno > 1) { 360 if (instance->lintno > 1) {
361 PERROR_CRITICAL 361 PERROR_CRITICAL
362 ("%s():Wrong subdevice index=%d plx:irq_status_reg=0x%04X.\n", 362 ("%s():Wrong subdevice index=%d plx:irq_status_reg=0x%04X.\n",
363 __FUNCTION__, instance->lintno, inl(instance->intcsr)); 363 __func__, instance->lintno, inl(instance->intcsr));
364 return IRQ_NONE; 364 return IRQ_NONE;
365 } 365 }
366 366
@@ -384,7 +384,7 @@ static irqreturn_t me0600_isr(int irq, void *dev_id, struct pt_regs *regs)
384 } else { 384 } else {
385 PINFO 385 PINFO
386 ("%ld Shared interrupt. %s(): idx=0 plx:irq_status_reg=0x%04X\n", 386 ("%ld Shared interrupt. %s(): idx=0 plx:irq_status_reg=0x%04X\n",
387 jiffies, __FUNCTION__, status); 387 jiffies, __func__, status);
388 ret = IRQ_NONE; 388 ret = IRQ_NONE;
389 } 389 }
390 spin_unlock(instance->intcsr_lock); 390 spin_unlock(instance->intcsr_lock);
diff --git a/drivers/staging/meilhaus/me1400_ext_irq.c b/drivers/staging/meilhaus/me1400_ext_irq.c
index b8c2696bc150..b4df7cc58ab7 100644
--- a/drivers/staging/meilhaus/me1400_ext_irq.c
+++ b/drivers/staging/meilhaus/me1400_ext_irq.c
@@ -349,7 +349,7 @@ static irqreturn_t me1400_ext_irq_isr(int irq, void *dev_id,
349 (PLX_LOCAL_INT1_STATE | PLX_LOCAL_INT1_EN | PLX_PCI_INT_EN)) { 349 (PLX_LOCAL_INT1_STATE | PLX_LOCAL_INT1_EN | PLX_PCI_INT_EN)) {
350 spin_unlock(&instance->subdevice_lock); 350 spin_unlock(&instance->subdevice_lock);
351 PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n", 351 PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n",
352 jiffies, __FUNCTION__, status); 352 jiffies, __func__, status);
353 return IRQ_NONE; 353 return IRQ_NONE;
354 } 354 }
355 355
diff --git a/drivers/staging/meilhaus/me1600_ao.c b/drivers/staging/meilhaus/me1600_ao.c
index 6f26665b30b7..d127c6b00307 100644
--- a/drivers/staging/meilhaus/me1600_ao.c
+++ b/drivers/staging/meilhaus/me1600_ao.c
@@ -977,7 +977,7 @@ static void me1600_ao_work_control_task(struct work_struct *work)
977 container_of((void *)work, me1600_ao_subdevice_t, ao_control_task); 977 container_of((void *)work, me1600_ao_subdevice_t, ao_control_task);
978#endif 978#endif
979 979
980 PINFO("<%s: %ld> executed. idx=%d\n", __FUNCTION__, jiffies, 980 PINFO("<%s: %ld> executed. idx=%d\n", __func__, jiffies,
981 instance->ao_idx); 981 instance->ao_idx);
982 982
983 if (!((instance->ao_regs_shadows)->trigger & instance->ao_idx)) { // Output was triggerd. 983 if (!((instance->ao_regs_shadows)->trigger & instance->ao_idx)) { // Output was triggerd.
@@ -1027,7 +1027,7 @@ static void me1600_ao_work_control_task(struct work_struct *work)
1027 queue_delayed_work(instance->me1600_workqueue, 1027 queue_delayed_work(instance->me1600_workqueue,
1028 &instance->ao_control_task, 1); 1028 &instance->ao_control_task, 1);
1029 } else { 1029 } else {
1030 PINFO("<%s> Ending control task.\n", __FUNCTION__); 1030 PINFO("<%s> Ending control task.\n", __func__);
1031 } 1031 }
1032 1032
1033} 1033}
diff --git a/drivers/staging/meilhaus/me4600_ai.c b/drivers/staging/meilhaus/me4600_ai.c
index 1a0de5dea277..0a8c9d737e90 100644
--- a/drivers/staging/meilhaus/me4600_ai.c
+++ b/drivers/staging/meilhaus/me4600_ai.c
@@ -2629,11 +2629,11 @@ static irqreturn_t me4600_ai_isr(int irq, void *dev_id, struct pt_regs *regs)
2629 if ((irq_status & (ME4600_IRQ_STATUS_BIT_AI_HF | ME4600_IRQ_STATUS_BIT_SC | ME4600_IRQ_STATUS_BIT_LE)) == ME4600_IRQ_STATUS_BIT_LE) { //This is security check case. LE is unused. This should never ever happend. 2629 if ((irq_status & (ME4600_IRQ_STATUS_BIT_AI_HF | ME4600_IRQ_STATUS_BIT_SC | ME4600_IRQ_STATUS_BIT_LE)) == ME4600_IRQ_STATUS_BIT_LE) { //This is security check case. LE is unused. This should never ever happend.
2630 PINFO 2630 PINFO
2631 ("%ld Shared interrupt. %s(): irq_status_reg=LE_IRQ\n", 2631 ("%ld Shared interrupt. %s(): irq_status_reg=LE_IRQ\n",
2632 jiffies, __FUNCTION__); 2632 jiffies, __func__);
2633 } else { 2633 } else {
2634 PINFO 2634 PINFO
2635 ("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n", 2635 ("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n",
2636 jiffies, __FUNCTION__, irq_status); 2636 jiffies, __func__, irq_status);
2637 } 2637 }
2638#endif 2638#endif
2639 return IRQ_NONE; 2639 return IRQ_NONE;
@@ -3329,7 +3329,7 @@ static void me4600_ai_work_control_task(struct work_struct *work)
3329 instance = 3329 instance =
3330 container_of((void *)work, me4600_ai_subdevice_t, ai_control_task); 3330 container_of((void *)work, me4600_ai_subdevice_t, ai_control_task);
3331#endif 3331#endif
3332 PINFO("<%s: %ld> executed.\n", __FUNCTION__, jiffies); 3332 PINFO("<%s: %ld> executed.\n", __func__, jiffies);
3333 3333
3334 status = inl(instance->status_reg); 3334 status = inl(instance->status_reg);
3335 PDEBUG_REG("status_reg inl(0x%lX+0x%lX)=0x%x\n", instance->reg_base, 3335 PDEBUG_REG("status_reg inl(0x%lX+0x%lX)=0x%x\n", instance->reg_base,
@@ -3428,7 +3428,7 @@ static void me4600_ai_work_control_task(struct work_struct *work)
3428 queue_delayed_work(instance->me4600_workqueue, 3428 queue_delayed_work(instance->me4600_workqueue,
3429 &instance->ai_control_task, 1); 3429 &instance->ai_control_task, 1);
3430 } else { 3430 } else {
3431 PINFO("<%s> Ending control task.\n", __FUNCTION__); 3431 PINFO("<%s> Ending control task.\n", __func__);
3432 } 3432 }
3433 3433
3434} 3434}
diff --git a/drivers/staging/meilhaus/me4600_ao.c b/drivers/staging/meilhaus/me4600_ao.c
index 2c92e655a81e..e2bec8229abd 100644
--- a/drivers/staging/meilhaus/me4600_ao.c
+++ b/drivers/staging/meilhaus/me4600_ao.c
@@ -2294,7 +2294,7 @@ static irqreturn_t me4600_ao_isr(int irq, void *dev_id
2294 irq_status = inl(instance->irq_status_reg); 2294 irq_status = inl(instance->irq_status_reg);
2295 if (!(irq_status & (ME4600_IRQ_STATUS_BIT_AO_HF << instance->ao_idx))) { 2295 if (!(irq_status & (ME4600_IRQ_STATUS_BIT_AO_HF << instance->ao_idx))) {
2296 PINFO("%ld Shared interrupt. %s(): ID=%d: status_reg=0x%04X\n", 2296 PINFO("%ld Shared interrupt. %s(): ID=%d: status_reg=0x%04X\n",
2297 jiffies, __FUNCTION__, instance->ao_idx, irq_status); 2297 jiffies, __func__, instance->ao_idx, irq_status);
2298 return IRQ_NONE; 2298 return IRQ_NONE;
2299 } 2299 }
2300 2300
@@ -3009,7 +3009,7 @@ static void me4600_ao_work_control_task(
3009 instance = 3009 instance =
3010 container_of((void *)work, me4600_ao_subdevice_t, ao_control_task); 3010 container_of((void *)work, me4600_ao_subdevice_t, ao_control_task);
3011#endif 3011#endif
3012 PINFO("<%s: %ld> executed. idx=%d\n", __FUNCTION__, jiffies, 3012 PINFO("<%s: %ld> executed. idx=%d\n", __func__, jiffies,
3013 instance->ao_idx); 3013 instance->ao_idx);
3014 3014
3015 status = inl(instance->status_reg); 3015 status = inl(instance->status_reg);
@@ -3316,7 +3316,7 @@ static void me4600_ao_work_control_task(
3316 queue_delayed_work(instance->me4600_workqueue, 3316 queue_delayed_work(instance->me4600_workqueue,
3317 &instance->ao_control_task, 1); 3317 &instance->ao_control_task, 1);
3318 } else { 3318 } else {
3319 PINFO("<%s> Ending control task.\n", __FUNCTION__); 3319 PINFO("<%s> Ending control task.\n", __func__);
3320 } 3320 }
3321 3321
3322} 3322}
diff --git a/drivers/staging/meilhaus/me4600_ext_irq.c b/drivers/staging/meilhaus/me4600_ext_irq.c
index 8a10dceae32a..adc1e1babf40 100644
--- a/drivers/staging/meilhaus/me4600_ext_irq.c
+++ b/drivers/staging/meilhaus/me4600_ext_irq.c
@@ -356,7 +356,7 @@ static irqreturn_t me4600_ext_irq_isr(int irq, void *dev_id,
356 irq_status = inl(instance->irq_status_reg); 356 irq_status = inl(instance->irq_status_reg);
357 if (!(irq_status & ME4600_IRQ_STATUS_BIT_EX)) { 357 if (!(irq_status & ME4600_IRQ_STATUS_BIT_EX)) {
358 PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n", 358 PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n",
359 jiffies, __FUNCTION__, irq_status); 359 jiffies, __func__, irq_status);
360 return IRQ_NONE; 360 return IRQ_NONE;
361 } 361 }
362 362
diff --git a/drivers/staging/meilhaus/me6000_ao.c b/drivers/staging/meilhaus/me6000_ao.c
index 3f5ff6d1b991..94f01231f79a 100644
--- a/drivers/staging/meilhaus/me6000_ao.c
+++ b/drivers/staging/meilhaus/me6000_ao.c
@@ -863,7 +863,7 @@ static int me6000_ao_io_single_write(me_subdevice_t * subdevice,
863 863
864/// @note When flag 'ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS' is set than output is triggered. ALWAYS! 864/// @note When flag 'ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS' is set than output is triggered. ALWAYS!
865 865
866 PINFO("<%s> start mode= 0x%08x %s\n", __FUNCTION__, mode, 866 PINFO("<%s> start mode= 0x%08x %s\n", __func__, mode,
867 (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" : 867 (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" :
868 ""); 868 "");
869 if (instance->fifo & ME6000_AO_HAS_FIFO) { // FIFO - Continous mode 869 if (instance->fifo & ME6000_AO_HAS_FIFO) { // FIFO - Continous mode
@@ -1663,7 +1663,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
1663 1663
1664 status = inl(instance->status_reg); 1664 status = inl(instance->status_reg);
1665 //Start state machine and interrupts 1665 //Start state machine and interrupts
1666 PINFO("<%s:%d> Start state machine.\n", __FUNCTION__, __LINE__); 1666 PINFO("<%s:%d> Start state machine.\n", __func__, __LINE__);
1667 ctrl &= ~(ME6000_AO_CTRL_BIT_STOP | ME6000_AO_CTRL_BIT_IMMEDIATE_STOP); 1667 ctrl &= ~(ME6000_AO_CTRL_BIT_STOP | ME6000_AO_CTRL_BIT_IMMEDIATE_STOP);
1668 if (instance->start_mode == ME6000_AO_EXT_TRIG) { 1668 if (instance->start_mode == ME6000_AO_EXT_TRIG) {
1669 PDEBUG("DIGITAL TRIGGER\n"); 1669 PDEBUG("DIGITAL TRIGGER\n");
@@ -1671,7 +1671,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
1671 } 1671 }
1672 if (!(status & ME6000_AO_STATUS_BIT_HF)) { //More than half! 1672 if (!(status & ME6000_AO_STATUS_BIT_HF)) { //More than half!
1673 if ((ctrl & ME6000_AO_CTRL_MODE_MASK) == ME6000_AO_MODE_CONTINUOUS) { //Enable IRQ only when hardware_continous is set and FIFO is more than half 1673 if ((ctrl & ME6000_AO_CTRL_MODE_MASK) == ME6000_AO_MODE_CONTINUOUS) { //Enable IRQ only when hardware_continous is set and FIFO is more than half
1674 PINFO("<%s:%d> Start interrupts.\n", __FUNCTION__, 1674 PINFO("<%s:%d> Start interrupts.\n", __func__,
1675 __LINE__); 1675 __LINE__);
1676 ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ; 1676 ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ;
1677 } 1677 }
@@ -1682,7 +1682,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
1682 spin_unlock_irqrestore(&instance->subdevice_lock, cpu_flags); 1682 spin_unlock_irqrestore(&instance->subdevice_lock, cpu_flags);
1683 1683
1684 //Trigger output 1684 //Trigger output
1685 PINFO("<%s> start mode= 0x%x %s\n", __FUNCTION__, instance->start_mode, 1685 PINFO("<%s> start mode= 0x%x %s\n", __func__, instance->start_mode,
1686 (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" : 1686 (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) ? "SYNCHRONOUS" :
1687 ""); 1687 "");
1688 if (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) { //Trigger outputs 1688 if (flags & ME_IO_SINGLE_TYPE_TRIG_SYNCHRONOUS) { //Trigger outputs
@@ -1777,7 +1777,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
1777 status = inl(instance->status_reg); 1777 status = inl(instance->status_reg);
1778 if (!(status & ME6000_AO_STATUS_BIT_HF)) { //More than half! 1778 if (!(status & ME6000_AO_STATUS_BIT_HF)) { //More than half!
1779 spin_lock_irqsave(&instance->subdevice_lock, cpu_flags); 1779 spin_lock_irqsave(&instance->subdevice_lock, cpu_flags);
1780 PINFO("<%s:%d> Start interrupts.\n", __FUNCTION__, 1780 PINFO("<%s:%d> Start interrupts.\n", __func__,
1781 __LINE__); 1781 __LINE__);
1782 ctrl = inl(instance->ctrl_reg); 1782 ctrl = inl(instance->ctrl_reg);
1783 ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ; 1783 ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ;
@@ -1819,7 +1819,7 @@ static int me6000_ao_io_stream_start(me_subdevice_t * subdevice,
1819 spin_lock_irqsave(&instance->subdevice_lock, 1819 spin_lock_irqsave(&instance->subdevice_lock,
1820 cpu_flags); 1820 cpu_flags);
1821 PINFO("<%s:%d> Start interrupts.\n", 1821 PINFO("<%s:%d> Start interrupts.\n",
1822 __FUNCTION__, __LINE__); 1822 __func__, __LINE__);
1823 ctrl = inl(instance->ctrl_reg); 1823 ctrl = inl(instance->ctrl_reg);
1824 ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ; 1824 ctrl |= ME6000_AO_CTRL_BIT_ENABLE_IRQ;
1825 outl(ctrl, instance->ctrl_reg); 1825 outl(ctrl, instance->ctrl_reg);
@@ -2346,7 +2346,7 @@ static irqreturn_t me6000_ao_isr(int irq, void *dev_id, struct pt_regs *regs)
2346 irq_status = inl(instance->irq_status_reg); 2346 irq_status = inl(instance->irq_status_reg);
2347 if (!(irq_status & (ME6000_IRQ_STATUS_BIT_AO_HF << instance->ao_idx))) { 2347 if (!(irq_status & (ME6000_IRQ_STATUS_BIT_AO_HF << instance->ao_idx))) {
2348 PINFO("%ld Shared interrupt. %s(): ID=%d: status_reg=0x%04X\n", 2348 PINFO("%ld Shared interrupt. %s(): ID=%d: status_reg=0x%04X\n",
2349 jiffies, __FUNCTION__, instance->ao_idx, irq_status); 2349 jiffies, __func__, instance->ao_idx, irq_status);
2350 return IRQ_NONE; 2350 return IRQ_NONE;
2351 } 2351 }
2352 2352
@@ -2861,7 +2861,7 @@ int inline ao_stop_immediately(me6000_ao_subdevice_t * instance)
2861 } 2861 }
2862 } 2862 }
2863 2863
2864 PINFO("<%s> Wait for stop: %d\n", __FUNCTION__, i); 2864 PINFO("<%s> Wait for stop: %d\n", __func__, i);
2865 2865
2866 //Still working! 2866 //Still working!
2867 set_current_state(TASK_INTERRUPTIBLE); 2867 set_current_state(TASK_INTERRUPTIBLE);
@@ -3132,7 +3132,7 @@ static void me6000_ao_work_control_task(
3132 instance = 3132 instance =
3133 container_of((void *)work, me6000_ao_subdevice_t, ao_control_task); 3133 container_of((void *)work, me6000_ao_subdevice_t, ao_control_task);
3134#endif 3134#endif
3135 PINFO("<%s: %ld> executed. idx=%d\n", __FUNCTION__, jiffies, 3135 PINFO("<%s: %ld> executed. idx=%d\n", __func__, jiffies,
3136 instance->ao_idx); 3136 instance->ao_idx);
3137 3137
3138 status = inl(instance->status_reg); 3138 status = inl(instance->status_reg);
@@ -3550,7 +3550,7 @@ static void me6000_ao_work_control_task(
3550 queue_delayed_work(instance->me6000_workqueue, 3550 queue_delayed_work(instance->me6000_workqueue,
3551 &instance->ao_control_task, 1); 3551 &instance->ao_control_task, 1);
3552 } else { 3552 } else {
3553 PINFO("<%s> Ending control task.\n", __FUNCTION__); 3553 PINFO("<%s> Ending control task.\n", __func__);
3554 } 3554 }
3555 3555
3556} 3556}
diff --git a/drivers/staging/meilhaus/me8100_di.c b/drivers/staging/meilhaus/me8100_di.c
index 0f146371b9a0..971727c9e305 100644
--- a/drivers/staging/meilhaus/me8100_di.c
+++ b/drivers/staging/meilhaus/me8100_di.c
@@ -536,7 +536,7 @@ static irqreturn_t me8100_isr(int irq, void *dev_id, struct pt_regs *regs)
536 PLX_INTCSR_LOCAL_INT1_EN)) { 536 PLX_INTCSR_LOCAL_INT1_EN)) {
537 PINFO 537 PINFO
538 ("%ld Shared interrupt. %s(): idx=0 plx:irq_status_reg=0x%04X\n", 538 ("%ld Shared interrupt. %s(): idx=0 plx:irq_status_reg=0x%04X\n",
539 jiffies, __FUNCTION__, icsr); 539 jiffies, __func__, icsr);
540 return IRQ_NONE; 540 return IRQ_NONE;
541 } 541 }
542 } else if (instance->di_idx == 1) { 542 } else if (instance->di_idx == 1) {
@@ -547,11 +547,11 @@ static irqreturn_t me8100_isr(int irq, void *dev_id, struct pt_regs *regs)
547 PLX_INTCSR_LOCAL_INT2_EN)) { 547 PLX_INTCSR_LOCAL_INT2_EN)) {
548 PINFO 548 PINFO
549 ("%ld Shared interrupt. %s(): idx=1 plx:irq_status_reg=0x%04X\n", 549 ("%ld Shared interrupt. %s(): idx=1 plx:irq_status_reg=0x%04X\n",
550 jiffies, __FUNCTION__, icsr); 550 jiffies, __func__, icsr);
551 return IRQ_NONE; 551 return IRQ_NONE;
552 } 552 }
553 } else { 553 } else {
554 PERROR("%s():Wrong interrupt idx=%d csr=0x%X.\n", __FUNCTION__, 554 PERROR("%s():Wrong interrupt idx=%d csr=0x%X.\n", __func__,
555 instance->di_idx, icsr); 555 instance->di_idx, icsr);
556 return IRQ_NONE; 556 return IRQ_NONE;
557 } 557 }
diff --git a/drivers/staging/meilhaus/me8200_di.c b/drivers/staging/meilhaus/me8200_di.c
index 0bb4567091cc..27525bc067b6 100644
--- a/drivers/staging/meilhaus/me8200_di.c
+++ b/drivers/staging/meilhaus/me8200_di.c
@@ -570,7 +570,7 @@ static irqreturn_t me8200_isr(int irq, void *dev_id, struct pt_regs *regs)
570 if (!irq_status) { 570 if (!irq_status) {
571 PINFO 571 PINFO
572 ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n", 572 ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n",
573 jiffies, __FUNCTION__, instance->di_idx, irq_status); 573 jiffies, __func__, instance->di_idx, irq_status);
574 return IRQ_NONE; 574 return IRQ_NONE;
575 } 575 }
576 576
@@ -658,7 +658,7 @@ static irqreturn_t me8200_isr_EX(int irq, void *dev_id, struct pt_regs *regs)
658 if (!irq_status) { 658 if (!irq_status) {
659 PINFO 659 PINFO
660 ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n", 660 ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n",
661 jiffies, __FUNCTION__, instance->di_idx, irq_status); 661 jiffies, __func__, instance->di_idx, irq_status);
662 return IRQ_NONE; 662 return IRQ_NONE;
663 } 663 }
664 664
diff --git a/drivers/staging/meilhaus/me8200_do.c b/drivers/staging/meilhaus/me8200_do.c
index 5f4ba5dfa860..d2bebd16ff41 100644
--- a/drivers/staging/meilhaus/me8200_do.c
+++ b/drivers/staging/meilhaus/me8200_do.c
@@ -475,7 +475,7 @@ static irqreturn_t me8200_do_isr(int irq, void *dev_id, struct pt_regs *regs)
475 (ME8200_DO_IRQ_STATUS_BIT_ACTIVE << instance->do_idx))) { 475 (ME8200_DO_IRQ_STATUS_BIT_ACTIVE << instance->do_idx))) {
476 PINFO 476 PINFO
477 ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n", 477 ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n",
478 jiffies, __FUNCTION__, instance->do_idx, irq_status); 478 jiffies, __func__, instance->do_idx, irq_status);
479 return IRQ_NONE; 479 return IRQ_NONE;
480 } 480 }
481 481
diff --git a/drivers/staging/meilhaus/medebug.h b/drivers/staging/meilhaus/medebug.h
index 382d00fe311d..dcfb97c26fd1 100644
--- a/drivers/staging/meilhaus/medebug.h
+++ b/drivers/staging/meilhaus/medebug.h
@@ -66,21 +66,21 @@
66 66
67#ifdef MEDEBUG_DEBUG 67#ifdef MEDEBUG_DEBUG
68# define PDEBUG(fmt, args...) \ 68# define PDEBUG(fmt, args...) \
69 printk(KERN_DEBUG"ME_DRV D: <%s> " fmt, __FUNCTION__, ##args) 69 printk(KERN_DEBUG"ME_DRV D: <%s> " fmt, __func__, ##args)
70#else 70#else
71# define PDEBUG(fmt, args...) 71# define PDEBUG(fmt, args...)
72#endif 72#endif
73 73
74#ifdef MEDEBUG_DEBUG_LOCKS 74#ifdef MEDEBUG_DEBUG_LOCKS
75# define PDEBUG_LOCKS(fmt, args...) \ 75# define PDEBUG_LOCKS(fmt, args...) \
76 printk(KERN_DEBUG"ME_DRV L: <%s> " fmt, __FUNCTION__, ##args) 76 printk(KERN_DEBUG"ME_DRV L: <%s> " fmt, __func__, ##args)
77#else 77#else
78# define PDEBUG_LOCKS(fmt, args...) 78# define PDEBUG_LOCKS(fmt, args...)
79#endif 79#endif
80 80
81#ifdef MEDEBUG_DEBUG_REG 81#ifdef MEDEBUG_DEBUG_REG
82# define PDEBUG_REG(fmt, args...) \ 82# define PDEBUG_REG(fmt, args...) \
83 printk(KERN_DEBUG"ME_DRV R: <%s:%d> REG:" fmt, __FUNCTION__, __LINE__, ##args) 83 printk(KERN_DEBUG"ME_DRV R: <%s:%d> REG:" fmt, __func__, __LINE__, ##args)
84#else 84#else
85# define PDEBUG_REG(fmt, args...) 85# define PDEBUG_REG(fmt, args...)
86#endif 86#endif
@@ -108,7 +108,7 @@
108 108
109//This debug is only to detect logical errors! 109//This debug is only to detect logical errors!
110# define PSECURITY(fmt, args...) \ 110# define PSECURITY(fmt, args...) \
111 printk(KERN_CRIT"ME_DRV SECURITY: <%s:%s:%i> " fmt, __FILE__, __FUNCTION__, __LINE__, ##args) 111 printk(KERN_CRIT"ME_DRV SECURITY: <%s:%s:%i> " fmt, __FILE__, __func__, __LINE__, ##args)
112//This debug is to keep track in customers' system 112//This debug is to keep track in customers' system
113# define PLOG(fmt, args...) \ 113# define PLOG(fmt, args...) \
114 printk(KERN_INFO"ME_DRV: " fmt, ##args) 114 printk(KERN_INFO"ME_DRV: " fmt, ##args)
@@ -116,7 +116,7 @@
116//This debug is to check new parts during development 116//This debug is to check new parts during development
117#ifdef MEDEBUG_DEVELOP 117#ifdef MEDEBUG_DEVELOP
118# define PDEVELOP(fmt, args...) \ 118# define PDEVELOP(fmt, args...) \
119 printk(KERN_CRIT"ME_DRV: <%s:%s:%i> " fmt, __FILE__, __FUNCTION__, __LINE__, ##args) 119 printk(KERN_CRIT"ME_DRV: <%s:%s:%i> " fmt, __FILE__, __func__, __LINE__, ##args)
120#else 120#else
121# define PDEVELOP(fmt, args...) 121# define PDEVELOP(fmt, args...)
122#endif 122#endif
diff --git a/drivers/staging/otus/80211core/cagg.c b/drivers/staging/otus/80211core/cagg.c
index fcfd01a6b36c..4942190747a1 100644
--- a/drivers/staging/otus/80211core/cagg.c
+++ b/drivers/staging/otus/80211core/cagg.c
@@ -1933,7 +1933,7 @@ u16_t zfAggRx(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo *addInfo, struct a
1933 */ 1933 */
1934 1934
1935 /* zm_msg2_agg(ZM_LV_0, "queue seq = ", seq_no); 1935 /* zm_msg2_agg(ZM_LV_0, "queue seq = ", seq_no);
1936 * DbgPrint("%s:%s%lxh %s%lxh\n", __FUNCTION__, "queue seq=", seq_no, 1936 * DbgPrint("%s:%s%lxh %s%lxh\n", __func__, "queue seq=", seq_no,
1937 * "; seq_start=", tid_rx->seq_start); 1937 * "; seq_start=", tid_rx->seq_start);
1938 */ 1938 */
1939 1939
diff --git a/drivers/staging/otus/80211core/pub_zfw.h b/drivers/staging/otus/80211core/pub_zfw.h
index 01a227216726..2474bb7536e8 100644
--- a/drivers/staging/otus/80211core/pub_zfw.h
+++ b/drivers/staging/otus/80211core/pub_zfw.h
@@ -23,7 +23,7 @@
23/* Buffer management */ 23/* Buffer management */
24#ifdef ZM_ENABLE_BUFFER_DEBUG 24#ifdef ZM_ENABLE_BUFFER_DEBUG
25extern zbuf_t* zfwBufAllocateWithContext(zdev_t* dev, u16_t len, u8_t *functionName, ULONG line); 25extern zbuf_t* zfwBufAllocateWithContext(zdev_t* dev, u16_t len, u8_t *functionName, ULONG line);
26#define zfwBufAllocate(dev, len) zfwBufAllocateWithContext(dev, len, (u8_t *)__FUNCTION__, __LINE__) 26#define zfwBufAllocate(dev, len) zfwBufAllocateWithContext(dev, len, (u8_t *)__func__, __LINE__)
27#else 27#else
28extern zbuf_t* zfwBufAllocate(zdev_t* dev, u16_t len); 28extern zbuf_t* zfwBufAllocate(zdev_t* dev, u16_t len);
29#endif 29#endif
diff --git a/drivers/staging/otus/80211core/struct.h b/drivers/staging/otus/80211core/struct.h
index 43631c630a8f..17b5ce37ebb5 100644
--- a/drivers/staging/otus/80211core/struct.h
+++ b/drivers/staging/otus/80211core/struct.h
@@ -137,7 +137,7 @@ extern const u8_t zg11gRateTbl[8];
137 137
138#ifdef ZM_ENABLE_BUFFER_TRACE 138#ifdef ZM_ENABLE_BUFFER_TRACE
139extern void zfwBufTrace(zdev_t* dev, zbuf_t *buf, u8_t *functionName); 139extern void zfwBufTrace(zdev_t* dev, zbuf_t *buf, u8_t *functionName);
140#define ZM_BUFFER_TRACE(dev, buf) zfwBufTrace(dev, buf, __FUNCTION__); 140#define ZM_BUFFER_TRACE(dev, buf) zfwBufTrace(dev, buf, __func__);
141#else 141#else
142#define ZM_BUFFER_TRACE(dev, buf) 142#define ZM_BUFFER_TRACE(dev, buf)
143#endif 143#endif
diff --git a/drivers/staging/otus/oal_marc.h b/drivers/staging/otus/oal_marc.h
index 438e4bc2e9a6..206111616a03 100644
--- a/drivers/staging/otus/oal_marc.h
+++ b/drivers/staging/otus/oal_marc.h
@@ -106,14 +106,14 @@
106 106
107/***** Debug message *****/ 107/***** Debug message *****/
108#if 0 108#if 0
109#define zm_debug_msg0(msg) printk("%s:%s\n", __FUNCTION__, msg); 109#define zm_debug_msg0(msg) printk("%s:%s\n", __func__, msg);
110#define zm_debug_msg1(msg, val) printk("%s:%s%ld\n", __FUNCTION__, \ 110#define zm_debug_msg1(msg, val) printk("%s:%s%ld\n", __func__, \
111 msg, (u32_t)val); 111 msg, (u32_t)val);
112#define zm_debug_msg2(msg, val) printk("%s:%s%lxh\n", __FUNCTION__, \ 112#define zm_debug_msg2(msg, val) printk("%s:%s%lxh\n", __func__, \
113 msg, (u32_t)val); 113 msg, (u32_t)val);
114#define zm_debug_msg_s(msg, val) printk("%s:%s%s\n", __FUNCTION__, \ 114#define zm_debug_msg_s(msg, val) printk("%s:%s%s\n", __func__, \
115 msg, val); 115 msg, val);
116#define zm_debug_msg_p(msg, val1, val2) printk("%s:%s%01ld.%02ld\n", __FUNCTION__, \ 116#define zm_debug_msg_p(msg, val1, val2) printk("%s:%s%01ld.%02ld\n", __func__, \
117 msg, (val1/val2), (((val1*100)/val2)%100)); 117 msg, (val1/val2), (((val1*100)/val2)%100));
118#define zm_dbg(S) printk S 118#define zm_dbg(S) printk S
119#else 119#else
@@ -127,7 +127,7 @@
127 127
128#define zm_assert(expr) if(!(expr)) { \ 128#define zm_assert(expr) if(!(expr)) { \
129 printk( "Atheors Assertion failed! %s,%s,%s,line=%d\n", \ 129 printk( "Atheors Assertion failed! %s,%s,%s,line=%d\n", \
130 #expr,__FILE__,__FUNCTION__,__LINE__); \ 130 #expr,__FILE__,__func__,__LINE__); \
131 } 131 }
132 132
133#define DbgPrint printk 133#define DbgPrint printk
diff --git a/drivers/staging/rt2860/2860_main_dev.c b/drivers/staging/rt2860/2860_main_dev.c
index 1e38f2d1f692..08ca81f43cc8 100644
--- a/drivers/staging/rt2860/2860_main_dev.c
+++ b/drivers/staging/rt2860/2860_main_dev.c
@@ -1202,7 +1202,7 @@ VOID RT28xx_UpdateBeaconToAsic(
1202 UCHAR bcn_idx = 0; 1202 UCHAR bcn_idx = 0;
1203 1203
1204 { 1204 {
1205 DBGPRINT(RT_DEBUG_ERROR, ("%s() : No valid Interface be found.\n", __FUNCTION__)); 1205 DBGPRINT(RT_DEBUG_ERROR, ("%s() : No valid Interface be found.\n", __func__));
1206 return; 1206 return;
1207 } 1207 }
1208 1208
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 8247aeb73a23..591d1e2158da 100644
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -599,7 +599,7 @@ VOID BAOriSessionAdd(
599 599
600 pBAEntry->ORIBATimer.TimerValue = 0; //pFrame->TimeOutValue; 600 pBAEntry->ORIBATimer.TimerValue = 0; //pFrame->TimeOutValue;
601 601
602 DBGPRINT(RT_DEBUG_TRACE,("%s : TXBAbitmap = %x, BAWinSize = %d, TimeOut = %ld\n", __FUNCTION__, pEntry->TXBAbitmap, 602 DBGPRINT(RT_DEBUG_TRACE,("%s : TXBAbitmap = %x, BAWinSize = %d, TimeOut = %ld\n", __func__, pEntry->TXBAbitmap,
603 pBAEntry->BAWinSize, pBAEntry->ORIBATimer.TimerValue)); 603 pBAEntry->BAWinSize, pBAEntry->ORIBATimer.TimerValue));
604 604
605 // SEND BAR ; 605 // SEND BAR ;
@@ -673,7 +673,7 @@ BOOLEAN BARecSessionAdd(
673 ba_refresh_reordering_mpdus(pAd, pBAEntry); 673 ba_refresh_reordering_mpdus(pAd, pBAEntry);
674 } 674 }
675 675
676 DBGPRINT(RT_DEBUG_TRACE,("%s(%ld): Idx = %d, BAWinSize(req %d) = %d\n", __FUNCTION__, pAd->BATable.numAsRecipient, Idx, 676 DBGPRINT(RT_DEBUG_TRACE,("%s(%ld): Idx = %d, BAWinSize(req %d) = %d\n", __func__, pAd->BATable.numAsRecipient, Idx,
677 pFrame->BaParm.BufSize, BAWinSize)); 677 pFrame->BaParm.BufSize, BAWinSize));
678 678
679 // Start fill in parameters. 679 // Start fill in parameters.
@@ -915,7 +915,7 @@ VOID BAOriSessionTearDown(
915 return; 915 return;
916 } 916 }
917 917
918 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __FUNCTION__, Wcid, TID)); 918 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __func__, Wcid, TID));
919 919
920 pBAEntry = &pAd->BATable.BAOriEntry[Idx]; 920 pBAEntry = &pAd->BATable.BAOriEntry[Idx];
921 DBGPRINT(RT_DEBUG_TRACE,("\t===>Idx = %ld, Wcid=%d.TID=%d, ORI_BA_Status = %d \n", Idx, Wcid, TID, pBAEntry->ORI_BA_Status)); 921 DBGPRINT(RT_DEBUG_TRACE,("\t===>Idx = %ld, Wcid=%d.TID=%d, ORI_BA_Status = %d \n", Idx, Wcid, TID, pBAEntry->ORI_BA_Status));
@@ -974,7 +974,7 @@ VOID BARecSessionTearDown(
974 if (Idx == 0) 974 if (Idx == 0)
975 return; 975 return;
976 976
977 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __FUNCTION__, Wcid, TID)); 977 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __func__, Wcid, TID));
978 978
979 979
980 pBAEntry = &pAd->BATable.BARecEntry[Idx]; 980 pBAEntry = &pAd->BATable.BARecEntry[Idx];
@@ -1185,7 +1185,7 @@ VOID PeerAddBAReqAction(
1185 PULONG ptemp; 1185 PULONG ptemp;
1186 PMAC_TABLE_ENTRY pMacEntry; 1186 PMAC_TABLE_ENTRY pMacEntry;
1187 1187
1188 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> (Wcid = %d)\n", __FUNCTION__, Elem->Wcid)); 1188 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> (Wcid = %d)\n", __func__, Elem->Wcid));
1189 1189
1190 //hex_dump("AddBAReq", Elem->Msg, Elem->MsgLen); 1190 //hex_dump("AddBAReq", Elem->Msg, Elem->MsgLen);
1191 1191
@@ -1269,7 +1269,7 @@ VOID PeerAddBAReqAction(
1269 MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen); 1269 MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen);
1270 MlmeFreeMemory(pAd, pOutBuffer); 1270 MlmeFreeMemory(pAd, pOutBuffer);
1271 1271
1272 DBGPRINT(RT_DEBUG_TRACE, ("%s(%d): TID(%d), BufSize(%d) <== \n", __FUNCTION__, Elem->Wcid, ADDframe.BaParm.TID, 1272 DBGPRINT(RT_DEBUG_TRACE, ("%s(%d): TID(%d), BufSize(%d) <== \n", __func__, Elem->Wcid, ADDframe.BaParm.TID,
1273 ADDframe.BaParm.BufSize)); 1273 ADDframe.BaParm.BufSize));
1274} 1274}
1275 1275
@@ -1288,7 +1288,7 @@ VOID PeerAddBARspAction(
1288 if (Elem->Wcid >= MAX_LEN_OF_MAC_TABLE) 1288 if (Elem->Wcid >= MAX_LEN_OF_MAC_TABLE)
1289 return; 1289 return;
1290 1290
1291 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> Wcid(%d)\n", __FUNCTION__, Elem->Wcid)); 1291 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> Wcid(%d)\n", __func__, Elem->Wcid));
1292 1292
1293 //hex_dump("PeerAddBARspAction()", Elem->Msg, Elem->MsgLen); 1293 //hex_dump("PeerAddBARspAction()", Elem->Msg, Elem->MsgLen);
1294 1294
@@ -1329,7 +1329,7 @@ VOID PeerDelBAAction(
1329 //PUCHAR pOutBuffer = NULL; 1329 //PUCHAR pOutBuffer = NULL;
1330 PFRAME_DELBA_REQ pDelFrame = NULL; 1330 PFRAME_DELBA_REQ pDelFrame = NULL;
1331 1331
1332 DBGPRINT(RT_DEBUG_TRACE,("%s ==>\n", __FUNCTION__)); 1332 DBGPRINT(RT_DEBUG_TRACE,("%s ==>\n", __func__));
1333 //DELBA Request from unknown peer, ignore this. 1333 //DELBA Request from unknown peer, ignore this.
1334 if (PeerDelBAActionSanity(pAd, Elem->Wcid, Elem->Msg, Elem->MsgLen)) 1334 if (PeerDelBAActionSanity(pAd, Elem->Wcid, Elem->Msg, Elem->MsgLen))
1335 { 1335 {
@@ -1366,7 +1366,7 @@ BOOLEAN CntlEnqueueForRecv(
1366 1366
1367 TID = (UCHAR)pFrame->BARControl.TID; 1367 TID = (UCHAR)pFrame->BARControl.TID;
1368 1368
1369 DBGPRINT(RT_DEBUG_TRACE, ("%s(): BAR-Wcid(%ld), Tid (%d)\n", __FUNCTION__, Wcid, TID)); 1369 DBGPRINT(RT_DEBUG_TRACE, ("%s(): BAR-Wcid(%ld), Tid (%d)\n", __func__, Wcid, TID));
1370 //hex_dump("BAR", (PCHAR) pFrame, MsgLen); 1370 //hex_dump("BAR", (PCHAR) pFrame, MsgLen);
1371 // Do nothing if the driver is starting halt state. 1371 // Do nothing if the driver is starting halt state.
1372 // This might happen when timer already been fired before cancel timer with mlmehalt 1372 // This might happen when timer already been fired before cancel timer with mlmehalt
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c
index ac549011ccb9..b67b9eba7229 100644
--- a/drivers/staging/rt2860/common/cmm_data.c
+++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -2787,7 +2787,7 @@ BOOLEAN MacTableDeleteEntry(
2787 } 2787 }
2788 else 2788 else
2789 { 2789 {
2790 printk("\n%s: Impossible Wcid = %d !!!!!\n", __FUNCTION__, wcid); 2790 printk("\n%s: Impossible Wcid = %d !!!!!\n", __func__, wcid);
2791 } 2791 }
2792 } 2792 }
2793 2793
diff --git a/drivers/staging/rt2860/common/cmm_data_2860.c b/drivers/staging/rt2860/common/cmm_data_2860.c
index 4f414edd658c..419e50c3fc4c 100644
--- a/drivers/staging/rt2860/common/cmm_data_2860.c
+++ b/drivers/staging/rt2860/common/cmm_data_2860.c
@@ -1002,7 +1002,7 @@ VOID RT28xxPciStaAsicSleepThenAutoWakeup(
1002 AutoWakeupCfg.field.AutoLeadTime = 5; 1002 AutoWakeupCfg.field.AutoLeadTime = 5;
1003 RTMP_IO_WRITE32(pAd, AUTO_WAKEUP_CFG, AutoWakeupCfg.word); 1003 RTMP_IO_WRITE32(pAd, AUTO_WAKEUP_CFG, AutoWakeupCfg.word);
1004 AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x00); // send POWER-SAVE command to MCU. Timeout 40us. 1004 AsicSendCommandToMcu(pAd, 0x30, 0xff, 0xff, 0x00); // send POWER-SAVE command to MCU. Timeout 40us.
1005 DBGPRINT(RT_DEBUG_TRACE, ("<-- %s, TbttNumToNextWakeUp=%d \n", __FUNCTION__, TbttNumToNextWakeUp)); 1005 DBGPRINT(RT_DEBUG_TRACE, ("<-- %s, TbttNumToNextWakeUp=%d \n", __func__, TbttNumToNextWakeUp));
1006 } 1006 }
1007 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_DOZE); 1007 OPSTATUS_SET_FLAG(pAd, fOP_STATUS_DOZE);
1008} 1008}
@@ -1115,7 +1115,7 @@ VOID RT28xxPciMlmeRadioOn(
1115 if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF)) 1115 if (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF))
1116 return; 1116 return;
1117 1117
1118 DBGPRINT(RT_DEBUG_TRACE,("%s===>\n", __FUNCTION__)); 1118 DBGPRINT(RT_DEBUG_TRACE,("%s===>\n", __func__));
1119 1119
1120 if ((pAd->OpMode == OPMODE_AP) || 1120 if ((pAd->OpMode == OPMODE_AP) ||
1121 ((pAd->OpMode == OPMODE_STA) && (!OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE)))) 1121 ((pAd->OpMode == OPMODE_STA) && (!OPSTATUS_TEST_FLAG(pAd, fOP_STATUS_ADVANCE_POWER_SAVE_PCIE_DEVICE))))
@@ -1165,7 +1165,7 @@ VOID RT28xxPciMlmeRadioOFF(
1165 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF)) 1165 if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RADIO_OFF))
1166 return; 1166 return;
1167 1167
1168 DBGPRINT(RT_DEBUG_TRACE,("%s===>\n", __FUNCTION__)); 1168 DBGPRINT(RT_DEBUG_TRACE,("%s===>\n", __func__));
1169 1169
1170 // Set LED 1170 // Set LED
1171 RTMPSetLED(pAd, LED_RADIO_OFF); 1171 RTMPSetLED(pAd, LED_RADIO_OFF);
diff --git a/drivers/staging/rt2860/common/cmm_info.c b/drivers/staging/rt2860/common/cmm_info.c
index 0aadf8af633a..dd92ac6eaed2 100644
--- a/drivers/staging/rt2860/common/cmm_info.c
+++ b/drivers/staging/rt2860/common/cmm_info.c
@@ -2039,7 +2039,7 @@ VOID RTMPIoctlGetMacTable(
2039 wrq->u.data.length = sizeof(RT_802_11_MAC_TABLE); 2039 wrq->u.data.length = sizeof(RT_802_11_MAC_TABLE);
2040 if (copy_to_user(wrq->u.data.pointer, &MacTab, wrq->u.data.length)) 2040 if (copy_to_user(wrq->u.data.pointer, &MacTab, wrq->u.data.length))
2041 { 2041 {
2042 DBGPRINT(RT_DEBUG_TRACE, ("%s: copy_to_user() fail\n", __FUNCTION__)); 2042 DBGPRINT(RT_DEBUG_TRACE, ("%s: copy_to_user() fail\n", __func__));
2043 } 2043 }
2044 2044
2045 msg = (CHAR *) kmalloc(sizeof(CHAR)*(MAX_LEN_OF_MAC_TABLE*MAC_LINE_LEN), MEM_ALLOC_FLAG); 2045 msg = (CHAR *) kmalloc(sizeof(CHAR)*(MAX_LEN_OF_MAC_TABLE*MAC_LINE_LEN), MEM_ALLOC_FLAG);
diff --git a/drivers/staging/rt2860/common/dfs.c b/drivers/staging/rt2860/common/dfs.c
index 23cf1510e2d2..b09bba5cb206 100644
--- a/drivers/staging/rt2860/common/dfs.c
+++ b/drivers/staging/rt2860/common/dfs.c
@@ -428,7 +428,7 @@ INT Set_ChMovingTime_Proc(
428 428
429 pAd->CommonCfg.RadarDetect.ChMovingTime = Value; 429 pAd->CommonCfg.RadarDetect.ChMovingTime = Value;
430 430
431 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __FUNCTION__, 431 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __func__,
432 pAd->CommonCfg.RadarDetect.ChMovingTime)); 432 pAd->CommonCfg.RadarDetect.ChMovingTime));
433 433
434 return TRUE; 434 return TRUE;
@@ -444,7 +444,7 @@ INT Set_LongPulseRadarTh_Proc(
444 444
445 pAd->CommonCfg.RadarDetect.LongPulseRadarTh = Value; 445 pAd->CommonCfg.RadarDetect.LongPulseRadarTh = Value;
446 446
447 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __FUNCTION__, 447 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __func__,
448 pAd->CommonCfg.RadarDetect.LongPulseRadarTh)); 448 pAd->CommonCfg.RadarDetect.LongPulseRadarTh));
449 449
450 return TRUE; 450 return TRUE;
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index 84edfa52dec3..563f2c5bb856 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -2542,7 +2542,7 @@ NDIS_STATUS NICLoadFirmware(
2542#ifdef BIN_IN_FILE 2542#ifdef BIN_IN_FILE
2543#define NICLF_DEFAULT_USE() \ 2543#define NICLF_DEFAULT_USE() \
2544 flg_default_firm_use = TRUE; \ 2544 flg_default_firm_use = TRUE; \
2545 printk("%s - Use default firmware!\n", __FUNCTION__); 2545 printk("%s - Use default firmware!\n", __func__);
2546 2546
2547 NDIS_STATUS Status = NDIS_STATUS_SUCCESS; 2547 NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
2548 PUCHAR src; 2548 PUCHAR src;
@@ -2557,7 +2557,7 @@ NDIS_STATUS NICLoadFirmware(
2557 BOOLEAN flg_default_firm_use = FALSE; 2557 BOOLEAN flg_default_firm_use = FALSE;
2558 2558
2559 2559
2560 DBGPRINT(RT_DEBUG_TRACE, ("===> %s\n", __FUNCTION__)); 2560 DBGPRINT(RT_DEBUG_TRACE, ("===> %s\n", __func__));
2561 2561
2562 /* init */ 2562 /* init */
2563 pFirmwareImage = NULL; 2563 pFirmwareImage = NULL;
@@ -2580,7 +2580,7 @@ NDIS_STATUS NICLoadFirmware(
2580 if (pFirmwareImage == NULL) 2580 if (pFirmwareImage == NULL)
2581 { 2581 {
2582 /* allocate fail, use default firmware array in firmware.h */ 2582 /* allocate fail, use default firmware array in firmware.h */
2583 printk("%s - Allocate memory fail!\n", __FUNCTION__); 2583 printk("%s - Allocate memory fail!\n", __func__);
2584 NICLF_DEFAULT_USE(); 2584 NICLF_DEFAULT_USE();
2585 } 2585 }
2586 else 2586 else
@@ -2601,7 +2601,7 @@ NDIS_STATUS NICLoadFirmware(
2601 if (IS_ERR(srcf)) 2601 if (IS_ERR(srcf))
2602 { 2602 {
2603 printk("%s - Error %ld opening %s\n", 2603 printk("%s - Error %ld opening %s\n",
2604 __FUNCTION__, -PTR_ERR(srcf), src); 2604 __func__, -PTR_ERR(srcf), src);
2605 NICLF_DEFAULT_USE(); 2605 NICLF_DEFAULT_USE();
2606 break; 2606 break;
2607 } /* End of if */ 2607 } /* End of if */
@@ -2609,7 +2609,7 @@ NDIS_STATUS NICLoadFirmware(
2609 /* the object must have a read method */ 2609 /* the object must have a read method */
2610 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL)) 2610 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL))
2611 { 2611 {
2612 printk("%s - %s does not have a write method\n", __FUNCTION__, src); 2612 printk("%s - %s does not have a write method\n", __func__, src);
2613 NICLF_DEFAULT_USE(); 2613 NICLF_DEFAULT_USE();
2614 break; 2614 break;
2615 } /* End of if */ 2615 } /* End of if */
@@ -2623,7 +2623,7 @@ NDIS_STATUS NICLoadFirmware(
2623 if (FileLength != MAX_FIRMWARE_IMAGE_SIZE) 2623 if (FileLength != MAX_FIRMWARE_IMAGE_SIZE)
2624 { 2624 {
2625 printk("%s: error file length (=%d) in RT2860AP.BIN\n", 2625 printk("%s: error file length (=%d) in RT2860AP.BIN\n",
2626 __FUNCTION__, FileLength); 2626 __func__, FileLength);
2627 NICLF_DEFAULT_USE(); 2627 NICLF_DEFAULT_USE();
2628 break; 2628 break;
2629 } 2629 }
@@ -2646,7 +2646,7 @@ NDIS_STATUS NICLoadFirmware(
2646 /* CRC fail */ 2646 /* CRC fail */
2647 printk("%s: CRC = 0x%02x 0x%02x " 2647 printk("%s: CRC = 0x%02x 0x%02x "
2648 "error, should be 0x%02x 0x%02x\n", 2648 "error, should be 0x%02x 0x%02x\n",
2649 __FUNCTION__, 2649 __func__,
2650 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-2], 2650 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-2],
2651 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-1], 2651 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-1],
2652 (UCHAR)(crc>>8), (UCHAR)(crc)); 2652 (UCHAR)(crc>>8), (UCHAR)(crc));
@@ -2665,7 +2665,7 @@ NDIS_STATUS NICLoadFirmware(
2665 ((FIRMWARE_MAJOR_VERSION << 8) + 2665 ((FIRMWARE_MAJOR_VERSION << 8) +
2666 FIRMWARE_MINOR_VERSION)) 2666 FIRMWARE_MINOR_VERSION))
2667 { 2667 {
2668 printk("%s: firmware version too old!\n", __FUNCTION__); 2668 printk("%s: firmware version too old!\n", __func__);
2669 NICLF_DEFAULT_USE(); 2669 NICLF_DEFAULT_USE();
2670 break; 2670 break;
2671 } /* End of if */ 2671 } /* End of if */
@@ -2770,7 +2770,7 @@ NDIS_STATUS NICLoadFirmware(
2770 } /* End of if */ 2770 } /* End of if */
2771 2771
2772 DBGPRINT(RT_DEBUG_TRACE, 2772 DBGPRINT(RT_DEBUG_TRACE,
2773 ("<=== %s (status=%d)\n", __FUNCTION__, Status)); 2773 ("<=== %s (status=%d)\n", __func__, Status));
2774 return Status; 2774 return Status;
2775} /* End of NICLoadFirmware */ 2775} /* End of NICLoadFirmware */
2776 2776
diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c
index 85e636a607f7..0265a6d1df1a 100644
--- a/drivers/staging/rt2860/common/spectrum.c
+++ b/drivers/staging/rt2860/common/spectrum.c
@@ -49,7 +49,7 @@ VOID MeasureReqTabInit(
49 if (pAd->CommonCfg.pMeasureReqTab) 49 if (pAd->CommonCfg.pMeasureReqTab)
50 NdisZeroMemory(pAd->CommonCfg.pMeasureReqTab, sizeof(MEASURE_REQ_TAB)); 50 NdisZeroMemory(pAd->CommonCfg.pMeasureReqTab, sizeof(MEASURE_REQ_TAB));
51 else 51 else
52 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pMeasureReqTab.\n", __FUNCTION__)); 52 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pMeasureReqTab.\n", __func__));
53 53
54 return; 54 return;
55} 55}
@@ -77,7 +77,7 @@ static PMEASURE_REQ_ENTRY MeasureReqLookUp(
77 77
78 if (pTab == NULL) 78 if (pTab == NULL)
79 { 79 {
80 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __FUNCTION__)); 80 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __func__));
81 return NULL; 81 return NULL;
82 } 82 }
83 83
@@ -114,7 +114,7 @@ static PMEASURE_REQ_ENTRY MeasureReqInsert(
114 114
115 if(pTab == NULL) 115 if(pTab == NULL)
116 { 116 {
117 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __FUNCTION__)); 117 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __func__));
118 return NULL; 118 return NULL;
119 } 119 }
120 120
@@ -175,7 +175,7 @@ static PMEASURE_REQ_ENTRY MeasureReqInsert(
175 else 175 else
176 { 176 {
177 pEntry = NULL; 177 pEntry = NULL;
178 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab tab full.\n", __FUNCTION__)); 178 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab tab full.\n", __func__));
179 } 179 }
180 180
181 // add this Neighbor entry into HASH table 181 // add this Neighbor entry into HASH table
@@ -210,7 +210,7 @@ static VOID MeasureReqDelete(
210 210
211 if(pTab == NULL) 211 if(pTab == NULL)
212 { 212 {
213 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __FUNCTION__)); 213 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __func__));
214 return; 214 return;
215 } 215 }
216 216
@@ -267,7 +267,7 @@ VOID TpcReqTabInit(
267 if (pAd->CommonCfg.pTpcReqTab) 267 if (pAd->CommonCfg.pTpcReqTab)
268 NdisZeroMemory(pAd->CommonCfg.pTpcReqTab, sizeof(TPC_REQ_TAB)); 268 NdisZeroMemory(pAd->CommonCfg.pTpcReqTab, sizeof(TPC_REQ_TAB));
269 else 269 else
270 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pTpcReqTab.\n", __FUNCTION__)); 270 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pTpcReqTab.\n", __func__));
271 271
272 return; 272 return;
273} 273}
@@ -295,7 +295,7 @@ static PTPC_REQ_ENTRY TpcReqLookUp(
295 295
296 if (pTab == NULL) 296 if (pTab == NULL)
297 { 297 {
298 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __FUNCTION__)); 298 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __func__));
299 return NULL; 299 return NULL;
300 } 300 }
301 301
@@ -333,7 +333,7 @@ static PTPC_REQ_ENTRY TpcReqInsert(
333 333
334 if(pTab == NULL) 334 if(pTab == NULL)
335 { 335 {
336 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __FUNCTION__)); 336 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __func__));
337 return NULL; 337 return NULL;
338 } 338 }
339 339
@@ -394,7 +394,7 @@ static PTPC_REQ_ENTRY TpcReqInsert(
394 else 394 else
395 { 395 {
396 pEntry = NULL; 396 pEntry = NULL;
397 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab tab full.\n", __FUNCTION__)); 397 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab tab full.\n", __func__));
398 } 398 }
399 399
400 // add this Neighbor entry into HASH table 400 // add this Neighbor entry into HASH table
@@ -429,7 +429,7 @@ static VOID TpcReqDelete(
429 429
430 if(pTab == NULL) 430 if(pTab == NULL)
431 { 431 {
432 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __FUNCTION__)); 432 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __func__));
433 return; 433 return;
434 } 434 }
435 435
@@ -782,7 +782,7 @@ VOID EnqueueMeasurementReq(
782 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 782 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
783 if(NStatus != NDIS_STATUS_SUCCESS) 783 if(NStatus != NDIS_STATUS_SUCCESS)
784 { 784 {
785 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 785 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
786 return; 786 return;
787 } 787 }
788 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 788 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -844,7 +844,7 @@ VOID EnqueueMeasurementRep(
844 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 844 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
845 if(NStatus != NDIS_STATUS_SUCCESS) 845 if(NStatus != NDIS_STATUS_SUCCESS)
846 { 846 {
847 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 847 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
848 return; 848 return;
849 } 849 }
850 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 850 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -898,7 +898,7 @@ VOID EnqueueTPCReq(
898 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 898 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
899 if(NStatus != NDIS_STATUS_SUCCESS) 899 if(NStatus != NDIS_STATUS_SUCCESS)
900 { 900 {
901 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 901 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
902 return; 902 return;
903 } 903 }
904 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 904 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -950,7 +950,7 @@ VOID EnqueueTPCRep(
950 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 950 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
951 if(NStatus != NDIS_STATUS_SUCCESS) 951 if(NStatus != NDIS_STATUS_SUCCESS)
952 { 952 {
953 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 953 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
954 return; 954 return;
955 } 955 }
956 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 956 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -1003,7 +1003,7 @@ VOID EnqueueChSwAnn(
1003 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 1003 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
1004 if(NStatus != NDIS_STATUS_SUCCESS) 1004 if(NStatus != NDIS_STATUS_SUCCESS)
1005 { 1005 {
1006 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 1006 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
1007 return; 1007 return;
1008 } 1008 }
1009 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 1009 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -1596,7 +1596,7 @@ static VOID PeerMeasureReportAction(
1596 1596
1597 if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL) 1597 if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL)
1598 { 1598 {
1599 DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __FUNCTION__, sizeof(MEASURE_RPI_REPORT))); 1599 DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __func__, sizeof(MEASURE_RPI_REPORT)));
1600 return; 1600 return;
1601 } 1601 }
1602 1602
@@ -1705,7 +1705,7 @@ static VOID PeerTpcRepAction(
1705 { 1705 {
1706 TpcReqDelete(pAd, pEntry->DialogToken); 1706 TpcReqDelete(pAd, pEntry->DialogToken);
1707 DBGPRINT(RT_DEBUG_TRACE, ("%s: DialogToken=%x, TxPwr=%d, LinkMargin=%d\n", 1707 DBGPRINT(RT_DEBUG_TRACE, ("%s: DialogToken=%x, TxPwr=%d, LinkMargin=%d\n",
1708 __FUNCTION__, DialogToken, TpcRepInfo.TxPwr, TpcRepInfo.LinkMargin)); 1708 __func__, DialogToken, TpcRepInfo.TxPwr, TpcRepInfo.LinkMargin));
1709 } 1709 }
1710 } 1710 }
1711 1711
@@ -1821,7 +1821,7 @@ INT Set_MeasureReq_Proc(
1821 MeasureReqType = simple_strtol(thisChar, 0, 16); 1821 MeasureReqType = simple_strtol(thisChar, 0, 16);
1822 if (MeasureReqType > 3) 1822 if (MeasureReqType > 3)
1823 { 1823 {
1824 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow MeasureReqType(%d)\n", __FUNCTION__, MeasureReqType)); 1824 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow MeasureReqType(%d)\n", __func__, MeasureReqType));
1825 return TRUE; 1825 return TRUE;
1826 } 1826 }
1827 break; 1827 break;
@@ -1833,10 +1833,10 @@ INT Set_MeasureReq_Proc(
1833 ArgIdx++; 1833 ArgIdx++;
1834 } 1834 }
1835 1835
1836 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d, MeasureReqType=%d MeasureCh=%d\n", __FUNCTION__, Aid, MeasureReqType, MeasureCh)); 1836 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d, MeasureReqType=%d MeasureCh=%d\n", __func__, Aid, MeasureReqType, MeasureCh));
1837 if (!VALID_WCID(Aid)) 1837 if (!VALID_WCID(Aid))
1838 { 1838 {
1839 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __FUNCTION__, Aid)); 1839 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __func__, Aid));
1840 return TRUE; 1840 return TRUE;
1841 } 1841 }
1842 1842
@@ -1861,10 +1861,10 @@ INT Set_TpcReq_Proc(
1861 1861
1862 Aid = simple_strtol(arg, 0, 16); 1862 Aid = simple_strtol(arg, 0, 16);
1863 1863
1864 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d\n", __FUNCTION__, Aid)); 1864 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d\n", __func__, Aid));
1865 if (!VALID_WCID(Aid)) 1865 if (!VALID_WCID(Aid))
1866 { 1866 {
1867 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __FUNCTION__, Aid)); 1867 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __func__, Aid));
1868 return TRUE; 1868 return TRUE;
1869 } 1869 }
1870 1870
diff --git a/drivers/staging/rt2860/rt_ate.c b/drivers/staging/rt2860/rt_ate.c
index 2f07db565c30..f3316ec0b156 100644
--- a/drivers/staging/rt2860/rt_ate.c
+++ b/drivers/staging/rt2860/rt_ate.c
@@ -291,7 +291,7 @@ static INT ATETxPwrHandler(
291 Bbp94 = BBPR94_DEFAULT; 291 Bbp94 = BBPR94_DEFAULT;
292 } 292 }
293 293
294 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%ld, BBP_R94=%d)\n", __FUNCTION__, TxPower, R, Bbp94)); 294 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%ld, BBP_R94=%d)\n", __func__, TxPower, R, Bbp94));
295 } 295 }
296 else// 5.5 GHz 296 else// 5.5 GHz
297 { 297 {
@@ -318,7 +318,7 @@ static INT ATETxPwrHandler(
318 R = (ULONG) TxPower; 318 R = (ULONG) TxPower;
319 } 319 }
320 320
321 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%lu)\n", __FUNCTION__, TxPower, R)); 321 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%lu)\n", __func__, TxPower, R));
322 } 322 }
323 323
324 if (pAd->ate.Channel <= 14) 324 if (pAd->ate.Channel <= 14)
@@ -431,7 +431,7 @@ static INT ATETxPwrHandler(
431 Bbp94 = BBPR94_DEFAULT; 431 Bbp94 = BBPR94_DEFAULT;
432 } 432 }
433 433
434 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R3=%ld, BBP_R94=%d)\n", __FUNCTION__, TxPower, R, Bbp94)); 434 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R3=%ld, BBP_R94=%d)\n", __func__, TxPower, R, Bbp94));
435 435
436 if (pAd->ate.Channel <= 14) 436 if (pAd->ate.Channel <= 14)
437 { 437 {
@@ -2098,7 +2098,7 @@ INT Set_ATE_Load_E2P_Proc(
2098 UINT32 FileLength = 0; 2098 UINT32 FileLength = 0;
2099 UINT32 value = simple_strtol(arg, 0, 10); 2099 UINT32 value = simple_strtol(arg, 0, 10);
2100 2100
2101 ATEDBGPRINT(RT_DEBUG_ERROR, ("===> %s (value=%d)\n\n", __FUNCTION__, value)); 2101 ATEDBGPRINT(RT_DEBUG_ERROR, ("===> %s (value=%d)\n\n", __func__, value));
2102 2102
2103 if (value > 0) 2103 if (value > 0)
2104 { 2104 {
@@ -2122,14 +2122,14 @@ INT Set_ATE_Load_E2P_Proc(
2122 2122
2123 if (IS_ERR(srcf)) 2123 if (IS_ERR(srcf))
2124 { 2124 {
2125 ate_print("%s - Error %ld opening %s\n", __FUNCTION__, -PTR_ERR(srcf), src); 2125 ate_print("%s - Error %ld opening %s\n", __func__, -PTR_ERR(srcf), src);
2126 break; 2126 break;
2127 } 2127 }
2128 2128
2129 /* the object must have a read method */ 2129 /* the object must have a read method */
2130 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL)) 2130 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL))
2131 { 2131 {
2132 ate_print("%s - %s does not have a read method\n", __FUNCTION__, src); 2132 ate_print("%s - %s does not have a read method\n", __func__, src);
2133 break; 2133 break;
2134 } 2134 }
2135 2135
@@ -2142,7 +2142,7 @@ INT Set_ATE_Load_E2P_Proc(
2142 if (FileLength != EEPROM_SIZE) 2142 if (FileLength != EEPROM_SIZE)
2143 { 2143 {
2144 ate_print("%s: error file length (=%d) in e2p.bin\n", 2144 ate_print("%s: error file length (=%d) in e2p.bin\n",
2145 __FUNCTION__, FileLength); 2145 __func__, FileLength);
2146 break; 2146 break;
2147 } 2147 }
2148 else 2148 else
@@ -2174,7 +2174,7 @@ INT Set_ATE_Load_E2P_Proc(
2174 current->fsuid = orgfsuid; 2174 current->fsuid = orgfsuid;
2175 current->fsgid = orgfsgid; 2175 current->fsgid = orgfsgid;
2176 } 2176 }
2177 ATEDBGPRINT(RT_DEBUG_ERROR, ("<=== %s (ret=%d)\n", __FUNCTION__, ret)); 2177 ATEDBGPRINT(RT_DEBUG_ERROR, ("<=== %s (ret=%d)\n", __func__, ret));
2178 2178
2179 return ret; 2179 return ret;
2180 2180
@@ -2187,12 +2187,12 @@ INT Set_ATE_Load_E2P_Proc(
2187 USHORT WriteEEPROM[(EEPROM_SIZE/2)]; 2187 USHORT WriteEEPROM[(EEPROM_SIZE/2)];
2188 struct iwreq *wrq = (struct iwreq *)arg; 2188 struct iwreq *wrq = (struct iwreq *)arg;
2189 2189
2190 ATEDBGPRINT(RT_DEBUG_TRACE, ("===> %s (wrq->u.data.length = %d)\n\n", __FUNCTION__, wrq->u.data.length)); 2190 ATEDBGPRINT(RT_DEBUG_TRACE, ("===> %s (wrq->u.data.length = %d)\n\n", __func__, wrq->u.data.length));
2191 2191
2192 if (wrq->u.data.length != EEPROM_SIZE) 2192 if (wrq->u.data.length != EEPROM_SIZE)
2193 { 2193 {
2194 ate_print("%s: error length (=%d) from host\n", 2194 ate_print("%s: error length (=%d) from host\n",
2195 __FUNCTION__, wrq->u.data.length); 2195 __func__, wrq->u.data.length);
2196 return FALSE; 2196 return FALSE;
2197 } 2197 }
2198 else/* (wrq->u.data.length == EEPROM_SIZE) */ 2198 else/* (wrq->u.data.length == EEPROM_SIZE) */
@@ -2211,7 +2211,7 @@ INT Set_ATE_Load_E2P_Proc(
2211 } while(FALSE); 2211 } while(FALSE);
2212 } 2212 }
2213 2213
2214 ATEDBGPRINT(RT_DEBUG_TRACE, ("<=== %s\n", __FUNCTION__)); 2214 ATEDBGPRINT(RT_DEBUG_TRACE, ("<=== %s\n", __func__));
2215 2215
2216 return TRUE; 2216 return TRUE;
2217 2217
@@ -3353,7 +3353,7 @@ static INT ATESetUpFrame(
3353 if (pPacket == NULL) 3353 if (pPacket == NULL)
3354 { 3354 {
3355 pAd->ate.TxCount = 0; 3355 pAd->ate.TxCount = 0;
3356 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s fail to alloc packet space.\n", __FUNCTION__)); 3356 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s fail to alloc packet space.\n", __func__));
3357 return -1; 3357 return -1;
3358 } 3358 }
3359 pTxRing->Cell[TxIdx].pNextNdisPacket = pPacket; 3359 pTxRing->Cell[TxIdx].pNextNdisPacket = pPacket;
@@ -3646,7 +3646,7 @@ VOID RtmpDoAte(
3646 3646
3647 Command_Id = ntohs(pRaCfg->command_id); 3647 Command_Id = ntohs(pRaCfg->command_id);
3648 3648
3649 ATEDBGPRINT(RT_DEBUG_TRACE,("\n%s: Command_Id = 0x%04x !\n", __FUNCTION__, Command_Id)); 3649 ATEDBGPRINT(RT_DEBUG_TRACE,("\n%s: Command_Id = 0x%04x !\n", __func__, Command_Id));
3650 3650
3651 switch (Command_Id) 3651 switch (Command_Id)
3652 { 3652 {
@@ -5690,7 +5690,7 @@ BOOLEAN SyncTxRxConfig(PRTMP_ADAPTER pAd, USHORT offset, UCHAR value)
5690 pAd->ate.TxAntennaSel = 2; 5690 pAd->ate.TxAntennaSel = 2;
5691 break; 5691 break;
5692 default: 5692 default:
5693 DBGPRINT(RT_DEBUG_TRACE, ("%s -- Sth. wrong! : return FALSE; \n", __FUNCTION__)); 5693 DBGPRINT(RT_DEBUG_TRACE, ("%s -- Sth. wrong! : return FALSE; \n", __func__));
5694 return FALSE; 5694 return FALSE;
5695 } 5695 }
5696 break;/* case BBP_R1 */ 5696 break;/* case BBP_R1 */
@@ -5728,13 +5728,13 @@ BOOLEAN SyncTxRxConfig(PRTMP_ADAPTER pAd, USHORT offset, UCHAR value)
5728 pAd->ate.RxAntennaSel = 3; 5728 pAd->ate.RxAntennaSel = 3;
5729 break; 5729 break;
5730 default: 5730 default:
5731 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Impossible! : return FALSE; \n", __FUNCTION__)); 5731 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Impossible! : return FALSE; \n", __func__));
5732 return FALSE; 5732 return FALSE;
5733 } 5733 }
5734 break;/* case BBP_R3 */ 5734 break;/* case BBP_R3 */
5735 5735
5736 default: 5736 default:
5737 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Sth. wrong! : return FALSE; \n", __FUNCTION__)); 5737 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Sth. wrong! : return FALSE; \n", __func__));
5738 return FALSE; 5738 return FALSE;
5739 5739
5740 } 5740 }
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index 374c174c88ee..f14500931efb 100644
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -406,7 +406,7 @@ NDIS_STATUS RTMPAllocateNdisPacket(
406 skb_put(GET_OS_PKT_TYPE(pPacket), HeaderLen+DataLen); 406 skb_put(GET_OS_PKT_TYPE(pPacket), HeaderLen+DataLen);
407 407
408 RTMP_SET_PACKET_SOURCE(pPacket, PKTSRC_NDIS); 408 RTMP_SET_PACKET_SOURCE(pPacket, PKTSRC_NDIS);
409// printk("%s : pPacket = %p, len = %d\n", __FUNCTION__, pPacket, GET_OS_PKT_LEN(pPacket)); 409// printk("%s : pPacket = %p, len = %d\n", __func__, pPacket, GET_OS_PKT_LEN(pPacket));
410 *ppPacket = pPacket; 410 *ppPacket = pPacket;
411 return NDIS_STATUS_SUCCESS; 411 return NDIS_STATUS_SUCCESS;
412} 412}
@@ -773,13 +773,13 @@ VOID RTMPSendWirelessEvent(
773 773
774 if (event_table_len == 0) 774 if (event_table_len == 0)
775 { 775 {
776 DBGPRINT(RT_DEBUG_ERROR, ("%s : The type(%0x02x) is not valid.\n", __FUNCTION__, type)); 776 DBGPRINT(RT_DEBUG_ERROR, ("%s : The type(%0x02x) is not valid.\n", __func__, type));
777 return; 777 return;
778 } 778 }
779 779
780 if (event >= event_table_len) 780 if (event >= event_table_len)
781 { 781 {
782 DBGPRINT(RT_DEBUG_ERROR, ("%s : The event(%0x02x) is not valid.\n", __FUNCTION__, event)); 782 DBGPRINT(RT_DEBUG_ERROR, ("%s : The event(%0x02x) is not valid.\n", __func__, event));
783 return; 783 return;
784 } 784 }
785 785
@@ -817,14 +817,14 @@ VOID RTMPSendWirelessEvent(
817 //send wireless event 817 //send wireless event
818 wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, pBuf); 818 wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, pBuf);
819 819
820 //DBGPRINT(RT_DEBUG_TRACE, ("%s : %s\n", __FUNCTION__, pBuf)); 820 //DBGPRINT(RT_DEBUG_TRACE, ("%s : %s\n", __func__, pBuf));
821 821
822 kfree(pBuf); 822 kfree(pBuf);
823 } 823 }
824 else 824 else
825 DBGPRINT(RT_DEBUG_ERROR, ("%s : Can't allocate memory for wireless event.\n", __FUNCTION__)); 825 DBGPRINT(RT_DEBUG_ERROR, ("%s : Can't allocate memory for wireless event.\n", __func__));
826#else 826#else
827 DBGPRINT(RT_DEBUG_ERROR, ("%s : The Wireless Extension MUST be v15 or newer.\n", __FUNCTION__)); 827 DBGPRINT(RT_DEBUG_ERROR, ("%s : The Wireless Extension MUST be v15 or newer.\n", __func__));
828#endif /* WIRELESS_EXT >= 15 */ 828#endif /* WIRELESS_EXT >= 15 */
829} 829}
830 830
@@ -848,13 +848,13 @@ void send_monitor_packets(
848 ASSERT(pRxBlk->pRxPacket); 848 ASSERT(pRxBlk->pRxPacket);
849 if (pRxBlk->DataSize < 10) 849 if (pRxBlk->DataSize < 10)
850 { 850 {
851 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too small! (%d)\n", __FUNCTION__, pRxBlk->DataSize)); 851 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too small! (%d)\n", __func__, pRxBlk->DataSize));
852 goto err_free_sk_buff; 852 goto err_free_sk_buff;
853 } 853 }
854 854
855 if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE) 855 if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE)
856 { 856 {
857 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __FUNCTION__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header))); 857 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));
858 goto err_free_sk_buff; 858 goto err_free_sk_buff;
859 } 859 }
860 860
@@ -910,7 +910,7 @@ void send_monitor_packets(
910 910
911 if (skb_headroom(pOSPkt) < (sizeof(wlan_ng_prism2_header)+ header_len)) { 911 if (skb_headroom(pOSPkt) < (sizeof(wlan_ng_prism2_header)+ header_len)) {
912 if (pskb_expand_head(pOSPkt, (sizeof(wlan_ng_prism2_header) + header_len), 0, GFP_ATOMIC)) { 912 if (pskb_expand_head(pOSPkt, (sizeof(wlan_ng_prism2_header) + header_len), 0, GFP_ATOMIC)) {
913 DBGPRINT(RT_DEBUG_ERROR, ("%s : Reallocate header size of sk_buff fail!\n", __FUNCTION__)); 913 DBGPRINT(RT_DEBUG_ERROR, ("%s : Reallocate header size of sk_buff fail!\n", __func__));
914 goto err_free_sk_buff; 914 goto err_free_sk_buff;
915 } //end if 915 } //end if
916 } //end if 916 } //end if
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
index 0cc7cf23d762..0fd58f5109f2 100644
--- a/drivers/staging/rt2860/rt_linux.h
+++ b/drivers/staging/rt2860/rt_linux.h
@@ -131,7 +131,7 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
131#define RT_MOD_INC_USE_COUNT() \ 131#define RT_MOD_INC_USE_COUNT() \
132 if (!try_module_get(THIS_MODULE)) \ 132 if (!try_module_get(THIS_MODULE)) \
133 { \ 133 { \
134 DBGPRINT(RT_DEBUG_ERROR, ("%s: cannot reserve module\n", __FUNCTION__)); \ 134 DBGPRINT(RT_DEBUG_ERROR, ("%s: cannot reserve module\n", __func__)); \
135 return -1; \ 135 return -1; \
136 } 136 }
137 137
diff --git a/drivers/staging/rt2860/rt_profile.c b/drivers/staging/rt2860/rt_profile.c
index cd7ffc8a6e8a..326a3cb52b9c 100644
--- a/drivers/staging/rt2860/rt_profile.c
+++ b/drivers/staging/rt2860/rt_profile.c
@@ -1024,7 +1024,7 @@ NDIS_STATUS RTMPReadParametersHook(
1024 pAd->MlmeAux.SsidLen = pAd->CommonCfg.SsidLen; 1024 pAd->MlmeAux.SsidLen = pAd->CommonCfg.SsidLen;
1025 NdisZeroMemory(pAd->MlmeAux.Ssid, NDIS_802_11_LENGTH_SSID); 1025 NdisZeroMemory(pAd->MlmeAux.Ssid, NDIS_802_11_LENGTH_SSID);
1026 NdisMoveMemory(pAd->MlmeAux.Ssid, tmpbuf, pAd->MlmeAux.SsidLen); 1026 NdisMoveMemory(pAd->MlmeAux.Ssid, tmpbuf, pAd->MlmeAux.SsidLen);
1027 DBGPRINT(RT_DEBUG_TRACE, ("%s::(SSID=%s)\n", __FUNCTION__, tmpbuf)); 1027 DBGPRINT(RT_DEBUG_TRACE, ("%s::(SSID=%s)\n", __func__, tmpbuf));
1028 } 1028 }
1029 } 1029 }
1030 } 1030 }
@@ -1043,7 +1043,7 @@ NDIS_STATUS RTMPReadParametersHook(
1043 pAd->StaCfg.BssType = BSS_INFRA; 1043 pAd->StaCfg.BssType = BSS_INFRA;
1044 // Reset Ralink supplicant to not use, it will be set to start when UI set PMK key 1044 // Reset Ralink supplicant to not use, it will be set to start when UI set PMK key
1045 pAd->StaCfg.WpaState = SS_NOTUSE; 1045 pAd->StaCfg.WpaState = SS_NOTUSE;
1046 DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __FUNCTION__, pAd->StaCfg.BssType)); 1046 DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __func__, pAd->StaCfg.BssType));
1047 } 1047 }
1048 } 1048 }
1049#endif // CONFIG_STA_SUPPORT // 1049#endif // CONFIG_STA_SUPPORT //
@@ -1337,7 +1337,7 @@ NDIS_STATUS RTMPReadParametersHook(
1337 1337
1338 pAd->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED; 1338 pAd->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED;
1339 1339
1340 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __FUNCTION__, pAd->StaCfg.WepStatus)); 1340 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
1341 } 1341 }
1342#endif // CONFIG_STA_SUPPORT // 1342#endif // CONFIG_STA_SUPPORT //
1343 } 1343 }
@@ -1363,7 +1363,7 @@ NDIS_STATUS RTMPReadParametersHook(
1363 pAd->StaCfg.OrigWepStatus = pAd->StaCfg.WepStatus; 1363 pAd->StaCfg.OrigWepStatus = pAd->StaCfg.WepStatus;
1364 pAd->StaCfg.bMixCipher = FALSE; 1364 pAd->StaCfg.bMixCipher = FALSE;
1365 1365
1366 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __FUNCTION__, pAd->StaCfg.WepStatus)); 1366 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
1367 } 1367 }
1368#endif // CONFIG_STA_SUPPORT // 1368#endif // CONFIG_STA_SUPPORT //
1369 } 1369 }
@@ -1400,7 +1400,7 @@ NDIS_STATUS RTMPReadParametersHook(
1400 else 1400 else
1401 { 1401 {
1402 err = 1; 1402 err = 1;
1403 DBGPRINT(RT_DEBUG_ERROR, ("%s::(WPAPSK key-string required 8 ~ 64 characters!)\n", __FUNCTION__)); 1403 DBGPRINT(RT_DEBUG_ERROR, ("%s::(WPAPSK key-string required 8 ~ 64 characters!)\n", __func__));
1404 } 1404 }
1405 1405
1406 if (err == 0) 1406 if (err == 0)
@@ -1416,7 +1416,7 @@ NDIS_STATUS RTMPReadParametersHook(
1416 pAd->StaCfg.WpaState = SS_NOTUSE; 1416 pAd->StaCfg.WpaState = SS_NOTUSE;
1417 } 1417 }
1418 1418
1419 DBGPRINT(RT_DEBUG_TRACE, ("%s::(WPAPSK=%s)\n", __FUNCTION__, tmpbuf)); 1419 DBGPRINT(RT_DEBUG_TRACE, ("%s::(WPAPSK=%s)\n", __func__, tmpbuf));
1420 } 1420 }
1421 } 1421 }
1422 } 1422 }
diff --git a/drivers/staging/rt2860/rtmp_def.h b/drivers/staging/rt2860/rtmp_def.h
index bb6f37b0bdc2..be982147883f 100644
--- a/drivers/staging/rt2860/rtmp_def.h
+++ b/drivers/staging/rt2860/rtmp_def.h
@@ -333,7 +333,7 @@
333/* sanity check for apidx */ 333/* sanity check for apidx */
334#define MBSS_MR_APIDX_SANITY_CHECK(apidx) \ 334#define MBSS_MR_APIDX_SANITY_CHECK(apidx) \
335 { if (apidx > MAX_MBSSID_NUM) { \ 335 { if (apidx > MAX_MBSSID_NUM) { \
336 printk("%s> Error! apidx = %d > MAX_MBSSID_NUM!\n", __FUNCTION__, apidx); \ 336 printk("%s> Error! apidx = %d > MAX_MBSSID_NUM!\n", __func__, apidx); \
337 apidx = MAIN_MBSSID; } } 337 apidx = MAIN_MBSSID; } }
338 338
339#define VALID_WCID(_wcid) ((_wcid) > 0 && (_wcid) < MAX_LEN_OF_MAC_TABLE ) 339#define VALID_WCID(_wcid) ((_wcid) > 0 && (_wcid) < MAX_LEN_OF_MAC_TABLE )
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 9347d11b586e..3ea2b2c4ab0e 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -2200,7 +2200,7 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info,
2200 } 2200 }
2201 break; 2201 break;
2202 default: 2202 default:
2203 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __FUNCTION__, subcmd)); 2203 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __func__, subcmd));
2204 break; 2204 break;
2205 } 2205 }
2206 2206
@@ -2219,7 +2219,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2219 MLME_DISASSOC_REQ_STRUCT DisAssocReq; 2219 MLME_DISASSOC_REQ_STRUCT DisAssocReq;
2220 MLME_DEAUTH_REQ_STRUCT DeAuthReq; 2220 MLME_DEAUTH_REQ_STRUCT DeAuthReq;
2221 2221
2222 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __FUNCTION__)); 2222 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __func__));
2223 2223
2224 if (pMlme == NULL) 2224 if (pMlme == NULL)
2225 return -EINVAL; 2225 return -EINVAL;
@@ -2228,7 +2228,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2228 { 2228 {
2229#ifdef IW_MLME_DEAUTH 2229#ifdef IW_MLME_DEAUTH
2230 case IW_MLME_DEAUTH: 2230 case IW_MLME_DEAUTH:
2231 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __FUNCTION__)); 2231 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __func__));
2232 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid); 2232 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid);
2233 DeAuthReq.Reason = pMlme->reason_code; 2233 DeAuthReq.Reason = pMlme->reason_code;
2234 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT); 2234 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT);
@@ -2243,7 +2243,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2243#endif // IW_MLME_DEAUTH // 2243#endif // IW_MLME_DEAUTH //
2244#ifdef IW_MLME_DISASSOC 2244#ifdef IW_MLME_DISASSOC
2245 case IW_MLME_DISASSOC: 2245 case IW_MLME_DISASSOC:
2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __FUNCTION__)); 2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __func__));
2247 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid); 2247 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid);
2248 DisAssocReq.Reason = pMlme->reason_code; 2248 DisAssocReq.Reason = pMlme->reason_code;
2249 2249
@@ -2257,7 +2257,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2257 break; 2257 break;
2258#endif // IW_MLME_DISASSOC // 2258#endif // IW_MLME_DISASSOC //
2259 default: 2259 default:
2260 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __FUNCTION__)); 2260 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __func__));
2261 break; 2261 break;
2262 } 2262 }
2263 2263
@@ -2290,7 +2290,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2290 else if (param->value == IW_AUTH_WPA_VERSION_WPA2) 2290 else if (param->value == IW_AUTH_WPA_VERSION_WPA2)
2291 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; 2291 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK;
2292 2292
2293 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2293 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2294 break; 2294 break;
2295 case IW_AUTH_CIPHER_PAIRWISE: 2295 case IW_AUTH_CIPHER_PAIRWISE:
2296 if (param->value == IW_AUTH_CIPHER_NONE) 2296 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2321,7 +2321,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2321 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus; 2321 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus;
2322 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled; 2322 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled;
2323 } 2323 }
2324 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __FUNCTION__, param->value)); 2324 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __func__, param->value));
2325 break; 2325 break;
2326 case IW_AUTH_CIPHER_GROUP: 2326 case IW_AUTH_CIPHER_GROUP:
2327 if (param->value == IW_AUTH_CIPHER_NONE) 2327 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2341,7 +2341,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2341 { 2341 {
2342 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled; 2342 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled;
2343 } 2343 }
2344 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __FUNCTION__, param->value)); 2344 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __func__, param->value));
2345 break; 2345 break;
2346 case IW_AUTH_KEY_MGMT: 2346 case IW_AUTH_KEY_MGMT:
2347 if (param->value == IW_AUTH_KEY_MGMT_802_1X) 2347 if (param->value == IW_AUTH_KEY_MGMT_802_1X)
@@ -2370,12 +2370,12 @@ int rt_ioctl_siwauth(struct net_device *dev,
2370 { 2370 {
2371 STA_PORT_SECURED(pAdapter); 2371 STA_PORT_SECURED(pAdapter);
2372 } 2372 }
2373 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __FUNCTION__, param->value)); 2373 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __func__, param->value));
2374 break; 2374 break;
2375 case IW_AUTH_RX_UNENCRYPTED_EAPOL: 2375 case IW_AUTH_RX_UNENCRYPTED_EAPOL:
2376 break; 2376 break;
2377 case IW_AUTH_PRIVACY_INVOKED: 2377 case IW_AUTH_PRIVACY_INVOKED:
2378 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __FUNCTION__, param->value)); 2378 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __func__, param->value));
2379 break; 2379 break;
2380 case IW_AUTH_DROP_UNENCRYPTED: 2380 case IW_AUTH_DROP_UNENCRYPTED:
2381 if (param->value != 0) 2381 if (param->value != 0)
@@ -2384,7 +2384,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2384 { 2384 {
2385 STA_PORT_SECURED(pAdapter); 2385 STA_PORT_SECURED(pAdapter);
2386 } 2386 }
2387 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2387 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2388 break; 2388 break;
2389 case IW_AUTH_80211_AUTH_ALG: 2389 case IW_AUTH_80211_AUTH_ALG:
2390 if (param->value & IW_AUTH_ALG_SHARED_KEY) 2390 if (param->value & IW_AUTH_ALG_SHARED_KEY)
@@ -2397,10 +2397,10 @@ int rt_ioctl_siwauth(struct net_device *dev,
2397 } 2397 }
2398 else 2398 else
2399 return -EINVAL; 2399 return -EINVAL;
2400 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __FUNCTION__, param->value)); 2400 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __func__, param->value));
2401 break; 2401 break;
2402 case IW_AUTH_WPA_ENABLED: 2402 case IW_AUTH_WPA_ENABLED:
2403 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __FUNCTION__, param->value)); 2403 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __func__, param->value));
2404 break; 2404 break;
2405 default: 2405 default:
2406 return -EOPNOTSUPP; 2406 return -EOPNOTSUPP;
@@ -2508,7 +2508,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2508 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE; 2508 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE;
2509 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx); 2509 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx);
2510 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY)); 2510 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY));
2511 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __FUNCTION__, encoding->flags)); 2511 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __func__, encoding->flags));
2512 } 2512 }
2513 else 2513 else
2514 { 2514 {
@@ -2520,15 +2520,15 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2520 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2520 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
2521 { 2521 {
2522 pAdapter->StaCfg.DefaultKeyId = keyIdx; 2522 pAdapter->StaCfg.DefaultKeyId = keyIdx;
2523 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __FUNCTION__, pAdapter->StaCfg.DefaultKeyId)); 2523 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __func__, pAdapter->StaCfg.DefaultKeyId));
2524 } 2524 }
2525 2525
2526 switch (alg) { 2526 switch (alg) {
2527 case IW_ENCODE_ALG_NONE: 2527 case IW_ENCODE_ALG_NONE:
2528 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __FUNCTION__)); 2528 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __func__));
2529 break; 2529 break;
2530 case IW_ENCODE_ALG_WEP: 2530 case IW_ENCODE_ALG_WEP:
2531 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __FUNCTION__, ext->key_len, keyIdx)); 2531 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __func__, ext->key_len, keyIdx));
2532 if (ext->key_len == MAX_WEP_KEY_SIZE) 2532 if (ext->key_len == MAX_WEP_KEY_SIZE)
2533 { 2533 {
2534 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE; 2534 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE;
@@ -2546,7 +2546,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2546 NdisMoveMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, ext->key, ext->key_len); 2546 NdisMoveMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, ext->key, ext->key_len);
2547 break; 2547 break;
2548 case IW_ENCODE_ALG_TKIP: 2548 case IW_ENCODE_ALG_TKIP:
2549 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __FUNCTION__, keyIdx, ext->key_len)); 2549 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __func__, keyIdx, ext->key_len));
2550 if (ext->key_len == 32) 2550 if (ext->key_len == 32)
2551 { 2551 {
2552 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2552 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
diff --git a/drivers/staging/rt2870/2870_main_dev.c b/drivers/staging/rt2870/2870_main_dev.c
index 91da4e2298ac..04c764d95d77 100644
--- a/drivers/staging/rt2870/2870_main_dev.c
+++ b/drivers/staging/rt2870/2870_main_dev.c
@@ -263,7 +263,7 @@ INT MlmeThread(
263 * This is important in preemption kernels, which transfer the flow 263 * This is important in preemption kernels, which transfer the flow
264 * of execution immediately upon a complete(). 264 * of execution immediately upon a complete().
265 */ 265 */
266 DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__FUNCTION__)); 266 DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__func__));
267 267
268 pObj->MLMEThr_pid = THREAD_PID_INIT_VALUE; 268 pObj->MLMEThr_pid = THREAD_PID_INIT_VALUE;
269 269
@@ -465,7 +465,7 @@ INT TimerQThread(
465 * This is important in preemption kernels, which transfer the flow 465 * This is important in preemption kernels, which transfer the flow
466 * of execution immediately upon a complete(). 466 * of execution immediately upon a complete().
467 */ 467 */
468 DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__FUNCTION__)); 468 DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__func__));
469 469
470 pObj->TimerQThr_pid = THREAD_PID_INIT_VALUE; 470 pObj->TimerQThr_pid = THREAD_PID_INIT_VALUE;
471 471
@@ -1258,7 +1258,7 @@ BOOLEAN RT28XXProbePostConfig(
1258 1258
1259 if (!(pAd->BulkInEpAddr && pAd->BulkOutEpAddr[0])) 1259 if (!(pAd->BulkInEpAddr && pAd->BulkOutEpAddr[0]))
1260 { 1260 {
1261 printk("%s: Could not find both bulk-in and bulk-out endpoints\n", __FUNCTION__); 1261 printk("%s: Could not find both bulk-in and bulk-out endpoints\n", __func__);
1262 return FALSE; 1262 return FALSE;
1263 } 1263 }
1264 1264
diff --git a/drivers/staging/rt2870/common/2870_rtmp_init.c b/drivers/staging/rt2870/common/2870_rtmp_init.c
index 5d89a310d1ea..9f5143b3922e 100644
--- a/drivers/staging/rt2870/common/2870_rtmp_init.c
+++ b/drivers/staging/rt2870/common/2870_rtmp_init.c
@@ -1087,7 +1087,7 @@ PNDIS_PACKET GetPacketFromRxRing(
1087 if (pRxWI->MPDUtotalByteCount > ThisFrameLen) 1087 if (pRxWI->MPDUtotalByteCount > ThisFrameLen)
1088 { 1088 {
1089 DBGPRINT(RT_DEBUG_ERROR, ("%s():pRxWIMPDUtotalByteCount(%d) large than RxDMALen(%ld)\n", 1089 DBGPRINT(RT_DEBUG_ERROR, ("%s():pRxWIMPDUtotalByteCount(%d) large than RxDMALen(%ld)\n",
1090 __FUNCTION__, pRxWI->MPDUtotalByteCount, ThisFrameLen)); 1090 __func__, pRxWI->MPDUtotalByteCount, ThisFrameLen));
1091 goto label_null; 1091 goto label_null;
1092 } 1092 }
1093#ifdef RT_BIG_ENDIAN 1093#ifdef RT_BIG_ENDIAN
@@ -1098,7 +1098,7 @@ PNDIS_PACKET GetPacketFromRxRing(
1098 pSkb = dev_alloc_skb(ThisFrameLen); 1098 pSkb = dev_alloc_skb(ThisFrameLen);
1099 if (pSkb == NULL) 1099 if (pSkb == NULL)
1100 { 1100 {
1101 DBGPRINT(RT_DEBUG_ERROR,("%s():Cannot Allocate sk buffer for this Bulk-In buffer!\n", __FUNCTION__)); 1101 DBGPRINT(RT_DEBUG_ERROR,("%s():Cannot Allocate sk buffer for this Bulk-In buffer!\n", __func__));
1102 goto label_null; 1102 goto label_null;
1103 } 1103 }
1104 1104
diff --git a/drivers/staging/rt2870/common/ba_action.c b/drivers/staging/rt2870/common/ba_action.c
index 95addb20bced..d9f738177e2b 100644
--- a/drivers/staging/rt2870/common/ba_action.c
+++ b/drivers/staging/rt2870/common/ba_action.c
@@ -595,7 +595,7 @@ VOID BAOriSessionAdd(
595 595
596 pBAEntry->ORIBATimer.TimerValue = 0; //pFrame->TimeOutValue; 596 pBAEntry->ORIBATimer.TimerValue = 0; //pFrame->TimeOutValue;
597 597
598 DBGPRINT(RT_DEBUG_TRACE,("%s : TXBAbitmap = %x, BAWinSize = %d, TimeOut = %ld\n", __FUNCTION__, pEntry->TXBAbitmap, 598 DBGPRINT(RT_DEBUG_TRACE,("%s : TXBAbitmap = %x, BAWinSize = %d, TimeOut = %ld\n", __func__, pEntry->TXBAbitmap,
599 pBAEntry->BAWinSize, pBAEntry->ORIBATimer.TimerValue)); 599 pBAEntry->BAWinSize, pBAEntry->ORIBATimer.TimerValue));
600 600
601 // SEND BAR ; 601 // SEND BAR ;
@@ -669,7 +669,7 @@ BOOLEAN BARecSessionAdd(
669 ba_refresh_reordering_mpdus(pAd, pBAEntry); 669 ba_refresh_reordering_mpdus(pAd, pBAEntry);
670 } 670 }
671 671
672 DBGPRINT(RT_DEBUG_TRACE,("%s(%ld): Idx = %d, BAWinSize(req %d) = %d\n", __FUNCTION__, pAd->BATable.numAsRecipient, Idx, 672 DBGPRINT(RT_DEBUG_TRACE,("%s(%ld): Idx = %d, BAWinSize(req %d) = %d\n", __func__, pAd->BATable.numAsRecipient, Idx,
673 pFrame->BaParm.BufSize, BAWinSize)); 673 pFrame->BaParm.BufSize, BAWinSize));
674 674
675 // Start fill in parameters. 675 // Start fill in parameters.
@@ -911,7 +911,7 @@ VOID BAOriSessionTearDown(
911 return; 911 return;
912 } 912 }
913 913
914 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __FUNCTION__, Wcid, TID)); 914 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __func__, Wcid, TID));
915 915
916 pBAEntry = &pAd->BATable.BAOriEntry[Idx]; 916 pBAEntry = &pAd->BATable.BAOriEntry[Idx];
917 DBGPRINT(RT_DEBUG_TRACE,("\t===>Idx = %ld, Wcid=%d.TID=%d, ORI_BA_Status = %d \n", Idx, Wcid, TID, pBAEntry->ORI_BA_Status)); 917 DBGPRINT(RT_DEBUG_TRACE,("\t===>Idx = %ld, Wcid=%d.TID=%d, ORI_BA_Status = %d \n", Idx, Wcid, TID, pBAEntry->ORI_BA_Status));
@@ -970,7 +970,7 @@ VOID BARecSessionTearDown(
970 if (Idx == 0) 970 if (Idx == 0)
971 return; 971 return;
972 972
973 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __FUNCTION__, Wcid, TID)); 973 DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __func__, Wcid, TID));
974 974
975 975
976 pBAEntry = &pAd->BATable.BARecEntry[Idx]; 976 pBAEntry = &pAd->BATable.BARecEntry[Idx];
@@ -1181,7 +1181,7 @@ VOID PeerAddBAReqAction(
1181 PULONG ptemp; 1181 PULONG ptemp;
1182 PMAC_TABLE_ENTRY pMacEntry; 1182 PMAC_TABLE_ENTRY pMacEntry;
1183 1183
1184 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> (Wcid = %d)\n", __FUNCTION__, Elem->Wcid)); 1184 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> (Wcid = %d)\n", __func__, Elem->Wcid));
1185 1185
1186 //hex_dump("AddBAReq", Elem->Msg, Elem->MsgLen); 1186 //hex_dump("AddBAReq", Elem->Msg, Elem->MsgLen);
1187 1187
@@ -1265,7 +1265,7 @@ VOID PeerAddBAReqAction(
1265 MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen); 1265 MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen);
1266 MlmeFreeMemory(pAd, pOutBuffer); 1266 MlmeFreeMemory(pAd, pOutBuffer);
1267 1267
1268 DBGPRINT(RT_DEBUG_TRACE, ("%s(%d): TID(%d), BufSize(%d) <== \n", __FUNCTION__, Elem->Wcid, ADDframe.BaParm.TID, 1268 DBGPRINT(RT_DEBUG_TRACE, ("%s(%d): TID(%d), BufSize(%d) <== \n", __func__, Elem->Wcid, ADDframe.BaParm.TID,
1269 ADDframe.BaParm.BufSize)); 1269 ADDframe.BaParm.BufSize));
1270} 1270}
1271 1271
@@ -1284,7 +1284,7 @@ VOID PeerAddBARspAction(
1284 if (Elem->Wcid >= MAX_LEN_OF_MAC_TABLE) 1284 if (Elem->Wcid >= MAX_LEN_OF_MAC_TABLE)
1285 return; 1285 return;
1286 1286
1287 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> Wcid(%d)\n", __FUNCTION__, Elem->Wcid)); 1287 DBGPRINT(RT_DEBUG_TRACE, ("%s ==> Wcid(%d)\n", __func__, Elem->Wcid));
1288 1288
1289 //hex_dump("PeerAddBARspAction()", Elem->Msg, Elem->MsgLen); 1289 //hex_dump("PeerAddBARspAction()", Elem->Msg, Elem->MsgLen);
1290 1290
@@ -1325,7 +1325,7 @@ VOID PeerDelBAAction(
1325 //PUCHAR pOutBuffer = NULL; 1325 //PUCHAR pOutBuffer = NULL;
1326 PFRAME_DELBA_REQ pDelFrame = NULL; 1326 PFRAME_DELBA_REQ pDelFrame = NULL;
1327 1327
1328 DBGPRINT(RT_DEBUG_TRACE,("%s ==>\n", __FUNCTION__)); 1328 DBGPRINT(RT_DEBUG_TRACE,("%s ==>\n", __func__));
1329 //DELBA Request from unknown peer, ignore this. 1329 //DELBA Request from unknown peer, ignore this.
1330 if (PeerDelBAActionSanity(pAd, Elem->Wcid, Elem->Msg, Elem->MsgLen)) 1330 if (PeerDelBAActionSanity(pAd, Elem->Wcid, Elem->Msg, Elem->MsgLen))
1331 { 1331 {
@@ -1362,7 +1362,7 @@ BOOLEAN CntlEnqueueForRecv(
1362 1362
1363 TID = (UCHAR)pFrame->BARControl.TID; 1363 TID = (UCHAR)pFrame->BARControl.TID;
1364 1364
1365 DBGPRINT(RT_DEBUG_TRACE, ("%s(): BAR-Wcid(%ld), Tid (%d)\n", __FUNCTION__, Wcid, TID)); 1365 DBGPRINT(RT_DEBUG_TRACE, ("%s(): BAR-Wcid(%ld), Tid (%d)\n", __func__, Wcid, TID));
1366 //hex_dump("BAR", (PCHAR) pFrame, MsgLen); 1366 //hex_dump("BAR", (PCHAR) pFrame, MsgLen);
1367 // Do nothing if the driver is starting halt state. 1367 // Do nothing if the driver is starting halt state.
1368 // This might happen when timer already been fired before cancel timer with mlmehalt 1368 // This might happen when timer already been fired before cancel timer with mlmehalt
diff --git a/drivers/staging/rt2870/common/cmm_data.c b/drivers/staging/rt2870/common/cmm_data.c
index 4477a8e64a29..fd809abf6df0 100644
--- a/drivers/staging/rt2870/common/cmm_data.c
+++ b/drivers/staging/rt2870/common/cmm_data.c
@@ -2009,7 +2009,7 @@ BOOLEAN MacTableDeleteEntry(
2009 } 2009 }
2010 else 2010 else
2011 { 2011 {
2012 printk("\n%s: Impossible Wcid = %d !!!!!\n", __FUNCTION__, wcid); 2012 printk("\n%s: Impossible Wcid = %d !!!!!\n", __func__, wcid);
2013 } 2013 }
2014 } 2014 }
2015 2015
diff --git a/drivers/staging/rt2870/common/cmm_info.c b/drivers/staging/rt2870/common/cmm_info.c
index 40792e162374..47a1b1a73f09 100644
--- a/drivers/staging/rt2870/common/cmm_info.c
+++ b/drivers/staging/rt2870/common/cmm_info.c
@@ -2331,7 +2331,7 @@ VOID RTMPIoctlGetMacTable(
2331 wrq->u.data.length = sizeof(RT_802_11_MAC_TABLE); 2331 wrq->u.data.length = sizeof(RT_802_11_MAC_TABLE);
2332 if (copy_to_user(wrq->u.data.pointer, &MacTab, wrq->u.data.length)) 2332 if (copy_to_user(wrq->u.data.pointer, &MacTab, wrq->u.data.length))
2333 { 2333 {
2334 DBGPRINT(RT_DEBUG_TRACE, ("%s: copy_to_user() fail\n", __FUNCTION__)); 2334 DBGPRINT(RT_DEBUG_TRACE, ("%s: copy_to_user() fail\n", __func__));
2335 } 2335 }
2336 2336
2337 msg = (CHAR *) kmalloc(sizeof(CHAR)*(MAX_LEN_OF_MAC_TABLE*MAC_LINE_LEN), MEM_ALLOC_FLAG); 2337 msg = (CHAR *) kmalloc(sizeof(CHAR)*(MAX_LEN_OF_MAC_TABLE*MAC_LINE_LEN), MEM_ALLOC_FLAG);
diff --git a/drivers/staging/rt2870/common/dfs.c b/drivers/staging/rt2870/common/dfs.c
index 23cf1510e2d2..b09bba5cb206 100644
--- a/drivers/staging/rt2870/common/dfs.c
+++ b/drivers/staging/rt2870/common/dfs.c
@@ -428,7 +428,7 @@ INT Set_ChMovingTime_Proc(
428 428
429 pAd->CommonCfg.RadarDetect.ChMovingTime = Value; 429 pAd->CommonCfg.RadarDetect.ChMovingTime = Value;
430 430
431 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __FUNCTION__, 431 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __func__,
432 pAd->CommonCfg.RadarDetect.ChMovingTime)); 432 pAd->CommonCfg.RadarDetect.ChMovingTime));
433 433
434 return TRUE; 434 return TRUE;
@@ -444,7 +444,7 @@ INT Set_LongPulseRadarTh_Proc(
444 444
445 pAd->CommonCfg.RadarDetect.LongPulseRadarTh = Value; 445 pAd->CommonCfg.RadarDetect.LongPulseRadarTh = Value;
446 446
447 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __FUNCTION__, 447 DBGPRINT(RT_DEBUG_TRACE, ("%s:: %d\n", __func__,
448 pAd->CommonCfg.RadarDetect.LongPulseRadarTh)); 448 pAd->CommonCfg.RadarDetect.LongPulseRadarTh));
449 449
450 return TRUE; 450 return TRUE;
diff --git a/drivers/staging/rt2870/common/rtmp_init.c b/drivers/staging/rt2870/common/rtmp_init.c
index 87028fd60bc2..870a00da3dac 100644
--- a/drivers/staging/rt2870/common/rtmp_init.c
+++ b/drivers/staging/rt2870/common/rtmp_init.c
@@ -2746,7 +2746,7 @@ NDIS_STATUS NICLoadFirmware(
2746#ifdef BIN_IN_FILE 2746#ifdef BIN_IN_FILE
2747#define NICLF_DEFAULT_USE() \ 2747#define NICLF_DEFAULT_USE() \
2748 flg_default_firm_use = TRUE; \ 2748 flg_default_firm_use = TRUE; \
2749 printk("%s - Use default firmware!\n", __FUNCTION__); 2749 printk("%s - Use default firmware!\n", __func__);
2750 2750
2751 NDIS_STATUS Status = NDIS_STATUS_SUCCESS; 2751 NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
2752 PUCHAR src; 2752 PUCHAR src;
@@ -2761,7 +2761,7 @@ NDIS_STATUS NICLoadFirmware(
2761 BOOLEAN flg_default_firm_use = FALSE; 2761 BOOLEAN flg_default_firm_use = FALSE;
2762 2762
2763 2763
2764 DBGPRINT(RT_DEBUG_TRACE, ("===> %s\n", __FUNCTION__)); 2764 DBGPRINT(RT_DEBUG_TRACE, ("===> %s\n", __func__));
2765 2765
2766 /* init */ 2766 /* init */
2767 pFirmwareImage = NULL; 2767 pFirmwareImage = NULL;
@@ -2784,7 +2784,7 @@ NDIS_STATUS NICLoadFirmware(
2784 if (pFirmwareImage == NULL) 2784 if (pFirmwareImage == NULL)
2785 { 2785 {
2786 /* allocate fail, use default firmware array in firmware.h */ 2786 /* allocate fail, use default firmware array in firmware.h */
2787 printk("%s - Allocate memory fail!\n", __FUNCTION__); 2787 printk("%s - Allocate memory fail!\n", __func__);
2788 NICLF_DEFAULT_USE(); 2788 NICLF_DEFAULT_USE();
2789 } 2789 }
2790 else 2790 else
@@ -2805,7 +2805,7 @@ NDIS_STATUS NICLoadFirmware(
2805 if (IS_ERR(srcf)) 2805 if (IS_ERR(srcf))
2806 { 2806 {
2807 printk("%s - Error %ld opening %s\n", 2807 printk("%s - Error %ld opening %s\n",
2808 __FUNCTION__, -PTR_ERR(srcf), src); 2808 __func__, -PTR_ERR(srcf), src);
2809 NICLF_DEFAULT_USE(); 2809 NICLF_DEFAULT_USE();
2810 break; 2810 break;
2811 } /* End of if */ 2811 } /* End of if */
@@ -2813,7 +2813,7 @@ NDIS_STATUS NICLoadFirmware(
2813 /* the object must have a read method */ 2813 /* the object must have a read method */
2814 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL)) 2814 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL))
2815 { 2815 {
2816 printk("%s - %s does not have a write method\n", __FUNCTION__, src); 2816 printk("%s - %s does not have a write method\n", __func__, src);
2817 NICLF_DEFAULT_USE(); 2817 NICLF_DEFAULT_USE();
2818 break; 2818 break;
2819 } /* End of if */ 2819 } /* End of if */
@@ -2827,7 +2827,7 @@ NDIS_STATUS NICLoadFirmware(
2827 if (FileLength != MAX_FIRMWARE_IMAGE_SIZE) 2827 if (FileLength != MAX_FIRMWARE_IMAGE_SIZE)
2828 { 2828 {
2829 printk("%s: error file length (=%d) in RT2860AP.BIN\n", 2829 printk("%s: error file length (=%d) in RT2860AP.BIN\n",
2830 __FUNCTION__, FileLength); 2830 __func__, FileLength);
2831 NICLF_DEFAULT_USE(); 2831 NICLF_DEFAULT_USE();
2832 break; 2832 break;
2833 } 2833 }
@@ -2850,7 +2850,7 @@ NDIS_STATUS NICLoadFirmware(
2850 /* CRC fail */ 2850 /* CRC fail */
2851 printk("%s: CRC = 0x%02x 0x%02x " 2851 printk("%s: CRC = 0x%02x 0x%02x "
2852 "error, should be 0x%02x 0x%02x\n", 2852 "error, should be 0x%02x 0x%02x\n",
2853 __FUNCTION__, 2853 __func__,
2854 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-2], 2854 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-2],
2855 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-1], 2855 pFirmwareImage[MAX_FIRMWARE_IMAGE_SIZE-1],
2856 (UCHAR)(crc>>8), (UCHAR)(crc)); 2856 (UCHAR)(crc>>8), (UCHAR)(crc));
@@ -2869,7 +2869,7 @@ NDIS_STATUS NICLoadFirmware(
2869 ((FIRMWARE_MAJOR_VERSION << 8) + 2869 ((FIRMWARE_MAJOR_VERSION << 8) +
2870 FIRMWARE_MINOR_VERSION)) 2870 FIRMWARE_MINOR_VERSION))
2871 { 2871 {
2872 printk("%s: firmware version too old!\n", __FUNCTION__); 2872 printk("%s: firmware version too old!\n", __func__);
2873 NICLF_DEFAULT_USE(); 2873 NICLF_DEFAULT_USE();
2874 break; 2874 break;
2875 } /* End of if */ 2875 } /* End of if */
@@ -3024,10 +3024,10 @@ NDIS_STATUS NICLoadFirmware(
3024 3024
3025#if 0 3025#if 0
3026 DBGPRINT(RT_DEBUG_TRACE, 3026 DBGPRINT(RT_DEBUG_TRACE,
3027 ("<=== %s (src=%s, status=%d)\n", __FUNCTION__, src, Status)); 3027 ("<=== %s (src=%s, status=%d)\n", __func__, src, Status));
3028#else 3028#else
3029 DBGPRINT(RT_DEBUG_TRACE, 3029 DBGPRINT(RT_DEBUG_TRACE,
3030 ("<=== %s (status=%d)\n", __FUNCTION__, Status)); 3030 ("<=== %s (status=%d)\n", __func__, Status));
3031#endif 3031#endif
3032 return Status; 3032 return Status;
3033} /* End of NICLoadFirmware */ 3033} /* End of NICLoadFirmware */
diff --git a/drivers/staging/rt2870/common/rtusb_bulk.c b/drivers/staging/rt2870/common/rtusb_bulk.c
index 3c6ba1b9deb1..c46d9166ccf4 100644
--- a/drivers/staging/rt2870/common/rtusb_bulk.c
+++ b/drivers/staging/rt2870/common/rtusb_bulk.c
@@ -329,7 +329,7 @@ VOID RTUSBBulkOutDataPacket(
329 329
330 if (pTxInfo->QSEL != FIFO_EDCA) 330 if (pTxInfo->QSEL != FIFO_EDCA)
331 { 331 {
332 printk("%s(): ====> pTxInfo->QueueSel(%d)!= FIFO_EDCA!!!!\n", __FUNCTION__, pTxInfo->QSEL); 332 printk("%s(): ====> pTxInfo->QueueSel(%d)!= FIFO_EDCA!!!!\n", __func__, pTxInfo->QSEL);
333 printk("\tCWPos=%ld, NBPos=%ld, ENBPos=%ld, bCopy=%d!\n", pHTTXContext->CurWritePosition, pHTTXContext->NextBulkOutPosition, pHTTXContext->ENextBulkOutPosition, pHTTXContext->bCopySavePad); 333 printk("\tCWPos=%ld, NBPos=%ld, ENBPos=%ld, bCopy=%d!\n", pHTTXContext->CurWritePosition, pHTTXContext->NextBulkOutPosition, pHTTXContext->ENextBulkOutPosition, pHTTXContext->bCopySavePad);
334 hex_dump("Wrong QSel Pkt:", (PUCHAR)&pWirelessPkt[TmpBulkEndPos], (pHTTXContext->CurWritePosition - pHTTXContext->NextBulkOutPosition)); 334 hex_dump("Wrong QSel Pkt:", (PUCHAR)&pWirelessPkt[TmpBulkEndPos], (pHTTXContext->CurWritePosition - pHTTXContext->NextBulkOutPosition));
335 } 335 }
@@ -942,7 +942,7 @@ VOID RTUSBBulkOutMLMEPacket(
942 pTxInfo = (PTXINFO_STRUC)pMLMEContext->TransferBuffer; 942 pTxInfo = (PTXINFO_STRUC)pMLMEContext->TransferBuffer;
943 if (pTxInfo->QSEL != FIFO_EDCA) 943 if (pTxInfo->QSEL != FIFO_EDCA)
944 { 944 {
945 printk("%s(): ====> pTxInfo->QueueSel(%d)!= FIFO_EDCA!!!!\n", __FUNCTION__, pTxInfo->QSEL); 945 printk("%s(): ====> pTxInfo->QueueSel(%d)!= FIFO_EDCA!!!!\n", __func__, pTxInfo->QSEL);
946 printk("\tMLME_Index=%d!\n", Index); 946 printk("\tMLME_Index=%d!\n", Index);
947 hex_dump("Wrong QSel Pkt:", (PUCHAR)pMLMEContext->TransferBuffer, pTxInfo->USBDMATxPktLen); 947 hex_dump("Wrong QSel Pkt:", (PUCHAR)pMLMEContext->TransferBuffer, pTxInfo->USBDMATxPktLen);
948 } 948 }
diff --git a/drivers/staging/rt2870/common/spectrum.c b/drivers/staging/rt2870/common/spectrum.c
index abba8405184f..43782ce9288f 100644
--- a/drivers/staging/rt2870/common/spectrum.c
+++ b/drivers/staging/rt2870/common/spectrum.c
@@ -48,7 +48,7 @@ VOID MeasureReqTabInit(
48 if (pAd->CommonCfg.pMeasureReqTab) 48 if (pAd->CommonCfg.pMeasureReqTab)
49 NdisZeroMemory(pAd->CommonCfg.pMeasureReqTab, sizeof(MEASURE_REQ_TAB)); 49 NdisZeroMemory(pAd->CommonCfg.pMeasureReqTab, sizeof(MEASURE_REQ_TAB));
50 else 50 else
51 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pMeasureReqTab.\n", __FUNCTION__)); 51 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pMeasureReqTab.\n", __func__));
52 52
53 return; 53 return;
54} 54}
@@ -76,7 +76,7 @@ static PMEASURE_REQ_ENTRY MeasureReqLookUp(
76 76
77 if (pTab == NULL) 77 if (pTab == NULL)
78 { 78 {
79 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __FUNCTION__)); 79 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __func__));
80 return NULL; 80 return NULL;
81 } 81 }
82 82
@@ -113,7 +113,7 @@ static PMEASURE_REQ_ENTRY MeasureReqInsert(
113 113
114 if(pTab == NULL) 114 if(pTab == NULL)
115 { 115 {
116 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __FUNCTION__)); 116 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __func__));
117 return NULL; 117 return NULL;
118 } 118 }
119 119
@@ -174,7 +174,7 @@ static PMEASURE_REQ_ENTRY MeasureReqInsert(
174 else 174 else
175 { 175 {
176 pEntry = NULL; 176 pEntry = NULL;
177 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab tab full.\n", __FUNCTION__)); 177 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab tab full.\n", __func__));
178 } 178 }
179 179
180 // add this Neighbor entry into HASH table 180 // add this Neighbor entry into HASH table
@@ -209,7 +209,7 @@ static VOID MeasureReqDelete(
209 209
210 if(pTab == NULL) 210 if(pTab == NULL)
211 { 211 {
212 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __FUNCTION__)); 212 DBGPRINT(RT_DEBUG_ERROR, ("%s: pMeasureReqTab doesn't exist.\n", __func__));
213 return; 213 return;
214 } 214 }
215 215
@@ -266,7 +266,7 @@ VOID TpcReqTabInit(
266 if (pAd->CommonCfg.pTpcReqTab) 266 if (pAd->CommonCfg.pTpcReqTab)
267 NdisZeroMemory(pAd->CommonCfg.pTpcReqTab, sizeof(TPC_REQ_TAB)); 267 NdisZeroMemory(pAd->CommonCfg.pTpcReqTab, sizeof(TPC_REQ_TAB));
268 else 268 else
269 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pTpcReqTab.\n", __FUNCTION__)); 269 DBGPRINT(RT_DEBUG_ERROR, ("%s Fail to alloc memory for pAd->CommonCfg.pTpcReqTab.\n", __func__));
270 270
271 return; 271 return;
272} 272}
@@ -294,7 +294,7 @@ static PTPC_REQ_ENTRY TpcReqLookUp(
294 294
295 if (pTab == NULL) 295 if (pTab == NULL)
296 { 296 {
297 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __FUNCTION__)); 297 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __func__));
298 return NULL; 298 return NULL;
299 } 299 }
300 300
@@ -332,7 +332,7 @@ static PTPC_REQ_ENTRY TpcReqInsert(
332 332
333 if(pTab == NULL) 333 if(pTab == NULL)
334 { 334 {
335 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __FUNCTION__)); 335 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __func__));
336 return NULL; 336 return NULL;
337 } 337 }
338 338
@@ -393,7 +393,7 @@ static PTPC_REQ_ENTRY TpcReqInsert(
393 else 393 else
394 { 394 {
395 pEntry = NULL; 395 pEntry = NULL;
396 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab tab full.\n", __FUNCTION__)); 396 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab tab full.\n", __func__));
397 } 397 }
398 398
399 // add this Neighbor entry into HASH table 399 // add this Neighbor entry into HASH table
@@ -428,7 +428,7 @@ static VOID TpcReqDelete(
428 428
429 if(pTab == NULL) 429 if(pTab == NULL)
430 { 430 {
431 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __FUNCTION__)); 431 DBGPRINT(RT_DEBUG_ERROR, ("%s: pTpcReqTab doesn't exist.\n", __func__));
432 return; 432 return;
433 } 433 }
434 434
@@ -781,7 +781,7 @@ VOID EnqueueMeasurementReq(
781 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 781 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
782 if(NStatus != NDIS_STATUS_SUCCESS) 782 if(NStatus != NDIS_STATUS_SUCCESS)
783 { 783 {
784 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 784 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
785 return; 785 return;
786 } 786 }
787 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 787 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -843,7 +843,7 @@ VOID EnqueueMeasurementRep(
843 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 843 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
844 if(NStatus != NDIS_STATUS_SUCCESS) 844 if(NStatus != NDIS_STATUS_SUCCESS)
845 { 845 {
846 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 846 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
847 return; 847 return;
848 } 848 }
849 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 849 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -897,7 +897,7 @@ VOID EnqueueTPCReq(
897 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 897 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
898 if(NStatus != NDIS_STATUS_SUCCESS) 898 if(NStatus != NDIS_STATUS_SUCCESS)
899 { 899 {
900 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 900 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
901 return; 901 return;
902 } 902 }
903 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 903 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -949,7 +949,7 @@ VOID EnqueueTPCRep(
949 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 949 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
950 if(NStatus != NDIS_STATUS_SUCCESS) 950 if(NStatus != NDIS_STATUS_SUCCESS)
951 { 951 {
952 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 952 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
953 return; 953 return;
954 } 954 }
955 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 955 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -1002,7 +1002,7 @@ VOID EnqueueChSwAnn(
1002 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory 1002 NStatus = MlmeAllocateMemory(pAd, (PVOID)&pOutBuffer); //Get an unused nonpaged memory
1003 if(NStatus != NDIS_STATUS_SUCCESS) 1003 if(NStatus != NDIS_STATUS_SUCCESS)
1004 { 1004 {
1005 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__)); 1005 DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __func__));
1006 return; 1006 return;
1007 } 1007 }
1008 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11)); 1008 NdisMoveMemory(pOutBuffer, (PCHAR)&ActHdr, sizeof(HEADER_802_11));
@@ -1595,7 +1595,7 @@ static VOID PeerMeasureReportAction(
1595 1595
1596 if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL) 1596 if ((pMeasureReportInfo = kmalloc(sizeof(MEASURE_RPI_REPORT), GFP_ATOMIC)) == NULL)
1597 { 1597 {
1598 DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __FUNCTION__, sizeof(MEASURE_RPI_REPORT))); 1598 DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%d).\n", __func__, sizeof(MEASURE_RPI_REPORT)));
1599 return; 1599 return;
1600 } 1600 }
1601 1601
@@ -1704,7 +1704,7 @@ static VOID PeerTpcRepAction(
1704 { 1704 {
1705 TpcReqDelete(pAd, pEntry->DialogToken); 1705 TpcReqDelete(pAd, pEntry->DialogToken);
1706 DBGPRINT(RT_DEBUG_TRACE, ("%s: DialogToken=%x, TxPwr=%d, LinkMargin=%d\n", 1706 DBGPRINT(RT_DEBUG_TRACE, ("%s: DialogToken=%x, TxPwr=%d, LinkMargin=%d\n",
1707 __FUNCTION__, DialogToken, TpcRepInfo.TxPwr, TpcRepInfo.LinkMargin)); 1707 __func__, DialogToken, TpcRepInfo.TxPwr, TpcRepInfo.LinkMargin));
1708 } 1708 }
1709 } 1709 }
1710 1710
@@ -1820,7 +1820,7 @@ INT Set_MeasureReq_Proc(
1820 MeasureReqType = simple_strtol(thisChar, 0, 16); 1820 MeasureReqType = simple_strtol(thisChar, 0, 16);
1821 if (MeasureReqType > 3) 1821 if (MeasureReqType > 3)
1822 { 1822 {
1823 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow MeasureReqType(%d)\n", __FUNCTION__, MeasureReqType)); 1823 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow MeasureReqType(%d)\n", __func__, MeasureReqType));
1824 return TRUE; 1824 return TRUE;
1825 } 1825 }
1826 break; 1826 break;
@@ -1832,10 +1832,10 @@ INT Set_MeasureReq_Proc(
1832 ArgIdx++; 1832 ArgIdx++;
1833 } 1833 }
1834 1834
1835 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d, MeasureReqType=%d MeasureCh=%d\n", __FUNCTION__, Aid, MeasureReqType, MeasureCh)); 1835 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d, MeasureReqType=%d MeasureCh=%d\n", __func__, Aid, MeasureReqType, MeasureCh));
1836 if (!VALID_WCID(Aid)) 1836 if (!VALID_WCID(Aid))
1837 { 1837 {
1838 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __FUNCTION__, Aid)); 1838 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __func__, Aid));
1839 return TRUE; 1839 return TRUE;
1840 } 1840 }
1841 1841
@@ -1860,10 +1860,10 @@ INT Set_TpcReq_Proc(
1860 1860
1861 Aid = simple_strtol(arg, 0, 16); 1861 Aid = simple_strtol(arg, 0, 16);
1862 1862
1863 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d\n", __FUNCTION__, Aid)); 1863 DBGPRINT(RT_DEBUG_TRACE, ("%s::Aid = %d\n", __func__, Aid));
1864 if (!VALID_WCID(Aid)) 1864 if (!VALID_WCID(Aid))
1865 { 1865 {
1866 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __FUNCTION__, Aid)); 1866 DBGPRINT(RT_DEBUG_ERROR, ("%s: unknow sta of Aid(%d)\n", __func__, Aid));
1867 return TRUE; 1867 return TRUE;
1868 } 1868 }
1869 1869
diff --git a/drivers/staging/rt2870/rt_ate.c b/drivers/staging/rt2870/rt_ate.c
index e99b3da0b62d..27c763ee9276 100644
--- a/drivers/staging/rt2870/rt_ate.c
+++ b/drivers/staging/rt2870/rt_ate.c
@@ -314,7 +314,7 @@ static INT ATETxPwrHandler(
314 Bbp94 = BBPR94_DEFAULT; 314 Bbp94 = BBPR94_DEFAULT;
315 } 315 }
316 316
317 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%ld, BBP_R94=%d)\n", __FUNCTION__, TxPower, R, Bbp94)); 317 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%ld, BBP_R94=%d)\n", __func__, TxPower, R, Bbp94));
318 } 318 }
319 else// 5.5 GHz 319 else// 5.5 GHz
320 { 320 {
@@ -341,7 +341,7 @@ static INT ATETxPwrHandler(
341 R = (ULONG) TxPower; 341 R = (ULONG) TxPower;
342 } 342 }
343 343
344 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%lu)\n", __FUNCTION__, TxPower, R)); 344 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R=%lu)\n", __func__, TxPower, R));
345 } 345 }
346 346
347 if (pAd->ate.Channel <= 14) 347 if (pAd->ate.Channel <= 14)
@@ -454,7 +454,7 @@ static INT ATETxPwrHandler(
454 Bbp94 = BBPR94_DEFAULT; 454 Bbp94 = BBPR94_DEFAULT;
455 } 455 }
456 456
457 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R3=%ld, BBP_R94=%d)\n", __FUNCTION__, TxPower, R, Bbp94)); 457 ATEDBGPRINT(RT_DEBUG_TRACE, ("%s (TxPower=%d, R3=%ld, BBP_R94=%d)\n", __func__, TxPower, R, Bbp94));
458 458
459 if (pAd->ate.Channel <= 14) 459 if (pAd->ate.Channel <= 14)
460 { 460 {
@@ -2261,7 +2261,7 @@ INT Set_ATE_Load_E2P_Proc(
2261 UINT32 FileLength = 0; 2261 UINT32 FileLength = 0;
2262 UINT32 value = simple_strtol(arg, 0, 10); 2262 UINT32 value = simple_strtol(arg, 0, 10);
2263 2263
2264 ATEDBGPRINT(RT_DEBUG_ERROR, ("===> %s (value=%d)\n\n", __FUNCTION__, value)); 2264 ATEDBGPRINT(RT_DEBUG_ERROR, ("===> %s (value=%d)\n\n", __func__, value));
2265 2265
2266 if (value > 0) 2266 if (value > 0)
2267 { 2267 {
@@ -2285,14 +2285,14 @@ INT Set_ATE_Load_E2P_Proc(
2285 2285
2286 if (IS_ERR(srcf)) 2286 if (IS_ERR(srcf))
2287 { 2287 {
2288 ate_print("%s - Error %ld opening %s\n", __FUNCTION__, -PTR_ERR(srcf), src); 2288 ate_print("%s - Error %ld opening %s\n", __func__, -PTR_ERR(srcf), src);
2289 break; 2289 break;
2290 } 2290 }
2291 2291
2292 /* the object must have a read method */ 2292 /* the object must have a read method */
2293 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL)) 2293 if ((srcf->f_op == NULL) || (srcf->f_op->read == NULL))
2294 { 2294 {
2295 ate_print("%s - %s does not have a read method\n", __FUNCTION__, src); 2295 ate_print("%s - %s does not have a read method\n", __func__, src);
2296 break; 2296 break;
2297 } 2297 }
2298 2298
@@ -2305,7 +2305,7 @@ INT Set_ATE_Load_E2P_Proc(
2305 if (FileLength != EEPROM_SIZE) 2305 if (FileLength != EEPROM_SIZE)
2306 { 2306 {
2307 ate_print("%s: error file length (=%d) in e2p.bin\n", 2307 ate_print("%s: error file length (=%d) in e2p.bin\n",
2308 __FUNCTION__, FileLength); 2308 __func__, FileLength);
2309 break; 2309 break;
2310 } 2310 }
2311 else 2311 else
@@ -2337,7 +2337,7 @@ INT Set_ATE_Load_E2P_Proc(
2337 current->fsuid = orgfsuid; 2337 current->fsuid = orgfsuid;
2338 current->fsgid = orgfsgid; 2338 current->fsgid = orgfsgid;
2339 } 2339 }
2340 ATEDBGPRINT(RT_DEBUG_ERROR, ("<=== %s (ret=%d)\n", __FUNCTION__, ret)); 2340 ATEDBGPRINT(RT_DEBUG_ERROR, ("<=== %s (ret=%d)\n", __func__, ret));
2341 2341
2342 return ret; 2342 return ret;
2343 2343
@@ -2350,12 +2350,12 @@ INT Set_ATE_Load_E2P_Proc(
2350 USHORT WriteEEPROM[(EEPROM_SIZE/2)]; 2350 USHORT WriteEEPROM[(EEPROM_SIZE/2)];
2351 struct iwreq *wrq = (struct iwreq *)arg; 2351 struct iwreq *wrq = (struct iwreq *)arg;
2352 2352
2353 ATEDBGPRINT(RT_DEBUG_TRACE, ("===> %s (wrq->u.data.length = %d)\n\n", __FUNCTION__, wrq->u.data.length)); 2353 ATEDBGPRINT(RT_DEBUG_TRACE, ("===> %s (wrq->u.data.length = %d)\n\n", __func__, wrq->u.data.length));
2354 2354
2355 if (wrq->u.data.length != EEPROM_SIZE) 2355 if (wrq->u.data.length != EEPROM_SIZE)
2356 { 2356 {
2357 ate_print("%s: error length (=%d) from host\n", 2357 ate_print("%s: error length (=%d) from host\n",
2358 __FUNCTION__, wrq->u.data.length); 2358 __func__, wrq->u.data.length);
2359 return FALSE; 2359 return FALSE;
2360 } 2360 }
2361 else/* (wrq->u.data.length == EEPROM_SIZE) */ 2361 else/* (wrq->u.data.length == EEPROM_SIZE) */
@@ -2374,7 +2374,7 @@ INT Set_ATE_Load_E2P_Proc(
2374 } while(FALSE); 2374 } while(FALSE);
2375 } 2375 }
2376 2376
2377 ATEDBGPRINT(RT_DEBUG_TRACE, ("<=== %s\n", __FUNCTION__)); 2377 ATEDBGPRINT(RT_DEBUG_TRACE, ("<=== %s\n", __func__));
2378 2378
2379 return TRUE; 2379 return TRUE;
2380 2380
@@ -4083,7 +4083,7 @@ VOID RtmpDoAte(
4083 4083
4084 Command_Id = ntohs(pRaCfg->command_id); 4084 Command_Id = ntohs(pRaCfg->command_id);
4085 4085
4086 ATEDBGPRINT(RT_DEBUG_TRACE,("\n%s: Command_Id = 0x%04x !\n", __FUNCTION__, Command_Id)); 4086 ATEDBGPRINT(RT_DEBUG_TRACE,("\n%s: Command_Id = 0x%04x !\n", __func__, Command_Id));
4087 4087
4088 switch (Command_Id) 4088 switch (Command_Id)
4089 { 4089 {
@@ -6117,7 +6117,7 @@ BOOLEAN SyncTxRxConfig(PRTMP_ADAPTER pAd, USHORT offset, UCHAR value)
6117 pAd->ate.TxAntennaSel = 2; 6117 pAd->ate.TxAntennaSel = 2;
6118 break; 6118 break;
6119 default: 6119 default:
6120 DBGPRINT(RT_DEBUG_TRACE, ("%s -- Sth. wrong! : return FALSE; \n", __FUNCTION__)); 6120 DBGPRINT(RT_DEBUG_TRACE, ("%s -- Sth. wrong! : return FALSE; \n", __func__));
6121 return FALSE; 6121 return FALSE;
6122 } 6122 }
6123 break;/* case BBP_R1 */ 6123 break;/* case BBP_R1 */
@@ -6155,13 +6155,13 @@ BOOLEAN SyncTxRxConfig(PRTMP_ADAPTER pAd, USHORT offset, UCHAR value)
6155 pAd->ate.RxAntennaSel = 3; 6155 pAd->ate.RxAntennaSel = 3;
6156 break; 6156 break;
6157 default: 6157 default:
6158 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Impossible! : return FALSE; \n", __FUNCTION__)); 6158 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Impossible! : return FALSE; \n", __func__));
6159 return FALSE; 6159 return FALSE;
6160 } 6160 }
6161 break;/* case BBP_R3 */ 6161 break;/* case BBP_R3 */
6162 6162
6163 default: 6163 default:
6164 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Sth. wrong! : return FALSE; \n", __FUNCTION__)); 6164 DBGPRINT(RT_DEBUG_ERROR, ("%s -- Sth. wrong! : return FALSE; \n", __func__));
6165 return FALSE; 6165 return FALSE;
6166 6166
6167 } 6167 }
diff --git a/drivers/staging/rt2870/rt_linux.c b/drivers/staging/rt2870/rt_linux.c
index f2ea8ebcd042..992e3d16f9b4 100644
--- a/drivers/staging/rt2870/rt_linux.c
+++ b/drivers/staging/rt2870/rt_linux.c
@@ -404,7 +404,7 @@ NDIS_STATUS RTMPAllocateNdisPacket(
404 skb_put(GET_OS_PKT_TYPE(pPacket), HeaderLen+DataLen); 404 skb_put(GET_OS_PKT_TYPE(pPacket), HeaderLen+DataLen);
405 405
406 RTMP_SET_PACKET_SOURCE(pPacket, PKTSRC_NDIS); 406 RTMP_SET_PACKET_SOURCE(pPacket, PKTSRC_NDIS);
407// printk("%s : pPacket = %p, len = %d\n", __FUNCTION__, pPacket, GET_OS_PKT_LEN(pPacket)); 407// printk("%s : pPacket = %p, len = %d\n", __func__, pPacket, GET_OS_PKT_LEN(pPacket));
408 *ppPacket = pPacket; 408 *ppPacket = pPacket;
409 return NDIS_STATUS_SUCCESS; 409 return NDIS_STATUS_SUCCESS;
410} 410}
@@ -814,13 +814,13 @@ VOID RTMPSendWirelessEvent(
814 814
815 if (event_table_len == 0) 815 if (event_table_len == 0)
816 { 816 {
817 DBGPRINT(RT_DEBUG_ERROR, ("%s : The type(%0x02x) is not valid.\n", __FUNCTION__, type)); 817 DBGPRINT(RT_DEBUG_ERROR, ("%s : The type(%0x02x) is not valid.\n", __func__, type));
818 return; 818 return;
819 } 819 }
820 820
821 if (event >= event_table_len) 821 if (event >= event_table_len)
822 { 822 {
823 DBGPRINT(RT_DEBUG_ERROR, ("%s : The event(%0x02x) is not valid.\n", __FUNCTION__, event)); 823 DBGPRINT(RT_DEBUG_ERROR, ("%s : The event(%0x02x) is not valid.\n", __func__, event));
824 return; 824 return;
825 } 825 }
826 826
@@ -858,14 +858,14 @@ VOID RTMPSendWirelessEvent(
858 //send wireless event 858 //send wireless event
859 wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, pBuf); 859 wireless_send_event(pAd->net_dev, IWEVCUSTOM, &wrqu, pBuf);
860 860
861 //DBGPRINT(RT_DEBUG_TRACE, ("%s : %s\n", __FUNCTION__, pBuf)); 861 //DBGPRINT(RT_DEBUG_TRACE, ("%s : %s\n", __func__, pBuf));
862 862
863 kfree(pBuf); 863 kfree(pBuf);
864 } 864 }
865 else 865 else
866 DBGPRINT(RT_DEBUG_ERROR, ("%s : Can't allocate memory for wireless event.\n", __FUNCTION__)); 866 DBGPRINT(RT_DEBUG_ERROR, ("%s : Can't allocate memory for wireless event.\n", __func__));
867#else 867#else
868 DBGPRINT(RT_DEBUG_ERROR, ("%s : The Wireless Extension MUST be v15 or newer.\n", __FUNCTION__)); 868 DBGPRINT(RT_DEBUG_ERROR, ("%s : The Wireless Extension MUST be v15 or newer.\n", __func__));
869#endif /* WIRELESS_EXT >= 15 */ 869#endif /* WIRELESS_EXT >= 15 */
870} 870}
871 871
@@ -889,13 +889,13 @@ void send_monitor_packets(
889 ASSERT(pRxBlk->pRxPacket); 889 ASSERT(pRxBlk->pRxPacket);
890 if (pRxBlk->DataSize < 10) 890 if (pRxBlk->DataSize < 10)
891 { 891 {
892 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too small! (%d)\n", __FUNCTION__, pRxBlk->DataSize)); 892 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too small! (%d)\n", __func__, pRxBlk->DataSize));
893 goto err_free_sk_buff; 893 goto err_free_sk_buff;
894 } 894 }
895 895
896 if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE) 896 if (pRxBlk->DataSize + sizeof(wlan_ng_prism2_header) > RX_BUFFER_AGGRESIZE)
897 { 897 {
898 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __FUNCTION__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header))); 898 DBGPRINT(RT_DEBUG_ERROR, ("%s : Size is too large! (%d)\n", __func__, pRxBlk->DataSize + sizeof(wlan_ng_prism2_header)));
899 goto err_free_sk_buff; 899 goto err_free_sk_buff;
900 } 900 }
901 901
@@ -951,7 +951,7 @@ void send_monitor_packets(
951 951
952 if (skb_headroom(pOSPkt) < (sizeof(wlan_ng_prism2_header)+ header_len)) { 952 if (skb_headroom(pOSPkt) < (sizeof(wlan_ng_prism2_header)+ header_len)) {
953 if (pskb_expand_head(pOSPkt, (sizeof(wlan_ng_prism2_header) + header_len), 0, GFP_ATOMIC)) { 953 if (pskb_expand_head(pOSPkt, (sizeof(wlan_ng_prism2_header) + header_len), 0, GFP_ATOMIC)) {
954 DBGPRINT(RT_DEBUG_ERROR, ("%s : Reallocate header size of sk_buff fail!\n", __FUNCTION__)); 954 DBGPRINT(RT_DEBUG_ERROR, ("%s : Reallocate header size of sk_buff fail!\n", __func__));
955 goto err_free_sk_buff; 955 goto err_free_sk_buff;
956 } //end if 956 } //end if
957 } //end if 957 } //end if
diff --git a/drivers/staging/rt2870/rt_linux.h b/drivers/staging/rt2870/rt_linux.h
index 814297577261..859f9cef0a19 100644
--- a/drivers/staging/rt2870/rt_linux.h
+++ b/drivers/staging/rt2870/rt_linux.h
@@ -124,7 +124,7 @@ typedef int (*HARD_START_XMIT_FUNC)(struct sk_buff *skb, struct net_device *net_
124#define RT_MOD_INC_USE_COUNT() \ 124#define RT_MOD_INC_USE_COUNT() \
125 if (!try_module_get(THIS_MODULE)) \ 125 if (!try_module_get(THIS_MODULE)) \
126 { \ 126 { \
127 DBGPRINT(RT_DEBUG_ERROR, ("%s: cannot reserve module\n", __FUNCTION__)); \ 127 DBGPRINT(RT_DEBUG_ERROR, ("%s: cannot reserve module\n", __func__)); \
128 return -1; \ 128 return -1; \
129 } 129 }
130 130
diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index b990f8a61641..313ecea0bfa8 100644
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -1554,7 +1554,7 @@ int rt28xx_packet_xmit(struct sk_buff *skb)
1554#if 0 1554#if 0
1555// if ((pkt->data[0] & 0x1) == 0) 1555// if ((pkt->data[0] & 0x1) == 0)
1556 { 1556 {
1557 //hex_dump(__FUNCTION__, pkt->data, pkt->len); 1557 //hex_dump(__func__, pkt->data, pkt->len);
1558 printk("pPacket = %x\n", pPacket); 1558 printk("pPacket = %x\n", pPacket);
1559 } 1559 }
1560#endif 1560#endif
diff --git a/drivers/staging/rt2870/rt_profile.c b/drivers/staging/rt2870/rt_profile.c
index c4474a6428ac..467fea35e4a9 100644
--- a/drivers/staging/rt2870/rt_profile.c
+++ b/drivers/staging/rt2870/rt_profile.c
@@ -1024,7 +1024,7 @@ NDIS_STATUS RTMPReadParametersHook(
1024 pAd->MlmeAux.SsidLen = pAd->CommonCfg.SsidLen; 1024 pAd->MlmeAux.SsidLen = pAd->CommonCfg.SsidLen;
1025 NdisZeroMemory(pAd->MlmeAux.Ssid, NDIS_802_11_LENGTH_SSID); 1025 NdisZeroMemory(pAd->MlmeAux.Ssid, NDIS_802_11_LENGTH_SSID);
1026 NdisMoveMemory(pAd->MlmeAux.Ssid, tmpbuf, pAd->MlmeAux.SsidLen); 1026 NdisMoveMemory(pAd->MlmeAux.Ssid, tmpbuf, pAd->MlmeAux.SsidLen);
1027 DBGPRINT(RT_DEBUG_TRACE, ("%s::(SSID=%s)\n", __FUNCTION__, tmpbuf)); 1027 DBGPRINT(RT_DEBUG_TRACE, ("%s::(SSID=%s)\n", __func__, tmpbuf));
1028 } 1028 }
1029 } 1029 }
1030 } 1030 }
@@ -1043,7 +1043,7 @@ NDIS_STATUS RTMPReadParametersHook(
1043 pAd->StaCfg.BssType = BSS_INFRA; 1043 pAd->StaCfg.BssType = BSS_INFRA;
1044 // Reset Ralink supplicant to not use, it will be set to start when UI set PMK key 1044 // Reset Ralink supplicant to not use, it will be set to start when UI set PMK key
1045 pAd->StaCfg.WpaState = SS_NOTUSE; 1045 pAd->StaCfg.WpaState = SS_NOTUSE;
1046 DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __FUNCTION__, pAd->StaCfg.BssType)); 1046 DBGPRINT(RT_DEBUG_TRACE, ("%s::(NetworkType=%d)\n", __func__, pAd->StaCfg.BssType));
1047 } 1047 }
1048 } 1048 }
1049#endif // CONFIG_STA_SUPPORT // 1049#endif // CONFIG_STA_SUPPORT //
@@ -1341,7 +1341,7 @@ NDIS_STATUS RTMPReadParametersHook(
1341 1341
1342 pAd->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED; 1342 pAd->StaCfg.PortSecured = WPA_802_1X_PORT_NOT_SECURED;
1343 1343
1344 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __FUNCTION__, pAd->StaCfg.WepStatus)); 1344 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
1345 } 1345 }
1346#endif // CONFIG_STA_SUPPORT // 1346#endif // CONFIG_STA_SUPPORT //
1347 } 1347 }
@@ -1368,7 +1368,7 @@ NDIS_STATUS RTMPReadParametersHook(
1368 pAd->StaCfg.bMixCipher = FALSE; 1368 pAd->StaCfg.bMixCipher = FALSE;
1369 1369
1370 //RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0); 1370 //RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0);
1371 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __FUNCTION__, pAd->StaCfg.WepStatus)); 1371 DBGPRINT(RT_DEBUG_TRACE, ("%s::(EncrypType=%d)\n", __func__, pAd->StaCfg.WepStatus));
1372 } 1372 }
1373#endif // CONFIG_STA_SUPPORT // 1373#endif // CONFIG_STA_SUPPORT //
1374 } 1374 }
@@ -1405,7 +1405,7 @@ NDIS_STATUS RTMPReadParametersHook(
1405 else 1405 else
1406 { 1406 {
1407 err = 1; 1407 err = 1;
1408 DBGPRINT(RT_DEBUG_ERROR, ("%s::(WPAPSK key-string required 8 ~ 64 characters!)\n", __FUNCTION__)); 1408 DBGPRINT(RT_DEBUG_ERROR, ("%s::(WPAPSK key-string required 8 ~ 64 characters!)\n", __func__));
1409 } 1409 }
1410 1410
1411 if (err == 0) 1411 if (err == 0)
@@ -1436,7 +1436,7 @@ NDIS_STATUS RTMPReadParametersHook(
1436 pAd->StaCfg.WpaState = SS_NOTUSE; 1436 pAd->StaCfg.WpaState = SS_NOTUSE;
1437 } 1437 }
1438 1438
1439 DBGPRINT(RT_DEBUG_TRACE, ("%s::(WPAPSK=%s)\n", __FUNCTION__, tmpbuf)); 1439 DBGPRINT(RT_DEBUG_TRACE, ("%s::(WPAPSK=%s)\n", __func__, tmpbuf));
1440 } 1440 }
1441 } 1441 }
1442 } 1442 }
diff --git a/drivers/staging/rt2870/rtmp_def.h b/drivers/staging/rt2870/rtmp_def.h
index 9b86325b4c55..c0f7561a9d9d 100644
--- a/drivers/staging/rt2870/rtmp_def.h
+++ b/drivers/staging/rt2870/rtmp_def.h
@@ -342,7 +342,7 @@
342/* sanity check for apidx */ 342/* sanity check for apidx */
343#define MBSS_MR_APIDX_SANITY_CHECK(apidx) \ 343#define MBSS_MR_APIDX_SANITY_CHECK(apidx) \
344 { if (apidx > MAX_MBSSID_NUM) { \ 344 { if (apidx > MAX_MBSSID_NUM) { \
345 printk("%s> Error! apidx = %d > MAX_MBSSID_NUM!\n", __FUNCTION__, apidx); \ 345 printk("%s> Error! apidx = %d > MAX_MBSSID_NUM!\n", __func__, apidx); \
346 apidx = MAIN_MBSSID; } } 346 apidx = MAIN_MBSSID; } }
347 347
348#define VALID_WCID(_wcid) ((_wcid) > 0 && (_wcid) < MAX_LEN_OF_MAC_TABLE ) 348#define VALID_WCID(_wcid) ((_wcid) > 0 && (_wcid) < MAX_LEN_OF_MAC_TABLE )
diff --git a/drivers/staging/rt2870/sta_ioctl.c b/drivers/staging/rt2870/sta_ioctl.c
index 422f39f9004a..91f0fab11313 100644
--- a/drivers/staging/rt2870/sta_ioctl.c
+++ b/drivers/staging/rt2870/sta_ioctl.c
@@ -2224,7 +2224,7 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info,
2224 wrq->length = strlen(extra) + 1; // 1: size of '\0' 2224 wrq->length = strlen(extra) + 1; // 1: size of '\0'
2225 break; 2225 break;
2226 default: 2226 default:
2227 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __FUNCTION__, subcmd)); 2227 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __func__, subcmd));
2228 break; 2228 break;
2229 } 2229 }
2230 2230
@@ -2243,7 +2243,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2243 MLME_DISASSOC_REQ_STRUCT DisAssocReq; 2243 MLME_DISASSOC_REQ_STRUCT DisAssocReq;
2244 MLME_DEAUTH_REQ_STRUCT DeAuthReq; 2244 MLME_DEAUTH_REQ_STRUCT DeAuthReq;
2245 2245
2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __FUNCTION__)); 2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __func__));
2247 2247
2248 if (pMlme == NULL) 2248 if (pMlme == NULL)
2249 return -EINVAL; 2249 return -EINVAL;
@@ -2252,7 +2252,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2252 { 2252 {
2253#ifdef IW_MLME_DEAUTH 2253#ifdef IW_MLME_DEAUTH
2254 case IW_MLME_DEAUTH: 2254 case IW_MLME_DEAUTH:
2255 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __FUNCTION__)); 2255 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __func__));
2256 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid); 2256 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid);
2257 DeAuthReq.Reason = pMlme->reason_code; 2257 DeAuthReq.Reason = pMlme->reason_code;
2258 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT); 2258 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT);
@@ -2267,7 +2267,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2267#endif // IW_MLME_DEAUTH // 2267#endif // IW_MLME_DEAUTH //
2268#ifdef IW_MLME_DISASSOC 2268#ifdef IW_MLME_DISASSOC
2269 case IW_MLME_DISASSOC: 2269 case IW_MLME_DISASSOC:
2270 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __FUNCTION__)); 2270 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __func__));
2271 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid); 2271 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid);
2272 DisAssocReq.Reason = pMlme->reason_code; 2272 DisAssocReq.Reason = pMlme->reason_code;
2273 2273
@@ -2281,7 +2281,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2281 break; 2281 break;
2282#endif // IW_MLME_DISASSOC // 2282#endif // IW_MLME_DISASSOC //
2283 default: 2283 default:
2284 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __FUNCTION__)); 2284 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __func__));
2285 break; 2285 break;
2286 } 2286 }
2287 2287
@@ -2314,7 +2314,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2314 else if (param->value == IW_AUTH_WPA_VERSION_WPA2) 2314 else if (param->value == IW_AUTH_WPA_VERSION_WPA2)
2315 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; 2315 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK;
2316 2316
2317 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2317 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2318 break; 2318 break;
2319 case IW_AUTH_CIPHER_PAIRWISE: 2319 case IW_AUTH_CIPHER_PAIRWISE:
2320 if (param->value == IW_AUTH_CIPHER_NONE) 2320 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2345,7 +2345,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2345 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus; 2345 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus;
2346 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled; 2346 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled;
2347 } 2347 }
2348 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __FUNCTION__, param->value)); 2348 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __func__, param->value));
2349 break; 2349 break;
2350 case IW_AUTH_CIPHER_GROUP: 2350 case IW_AUTH_CIPHER_GROUP:
2351 if (param->value == IW_AUTH_CIPHER_NONE) 2351 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2365,7 +2365,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2365 { 2365 {
2366 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled; 2366 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled;
2367 } 2367 }
2368 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __FUNCTION__, param->value)); 2368 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __func__, param->value));
2369 break; 2369 break;
2370 case IW_AUTH_KEY_MGMT: 2370 case IW_AUTH_KEY_MGMT:
2371 if (param->value == IW_AUTH_KEY_MGMT_802_1X) 2371 if (param->value == IW_AUTH_KEY_MGMT_802_1X)
@@ -2395,7 +2395,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2395 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; 2395 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
2396 STA_PORT_SECURED(pAdapter); 2396 STA_PORT_SECURED(pAdapter);
2397 } 2397 }
2398 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __FUNCTION__, param->value)); 2398 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __func__, param->value));
2399 break; 2399 break;
2400 case IW_AUTH_RX_UNENCRYPTED_EAPOL: 2400 case IW_AUTH_RX_UNENCRYPTED_EAPOL:
2401 break; 2401 break;
@@ -2408,7 +2408,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2408 pAdapter->StaCfg.PairCipher = Ndis802_11WEPDisabled; 2408 pAdapter->StaCfg.PairCipher = Ndis802_11WEPDisabled;
2409 pAdapter->StaCfg.GroupCipher = Ndis802_11WEPDisabled; 2409 pAdapter->StaCfg.GroupCipher = Ndis802_11WEPDisabled;
2410 }*/ 2410 }*/
2411 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __FUNCTION__, param->value)); 2411 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __func__, param->value));
2412 break; 2412 break;
2413 case IW_AUTH_DROP_UNENCRYPTED: 2413 case IW_AUTH_DROP_UNENCRYPTED:
2414 if (param->value != 0) 2414 if (param->value != 0)
@@ -2418,7 +2418,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2418 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; 2418 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
2419 STA_PORT_SECURED(pAdapter); 2419 STA_PORT_SECURED(pAdapter);
2420 } 2420 }
2421 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2421 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2422 break; 2422 break;
2423 case IW_AUTH_80211_AUTH_ALG: 2423 case IW_AUTH_80211_AUTH_ALG:
2424 if (param->value & IW_AUTH_ALG_SHARED_KEY) 2424 if (param->value & IW_AUTH_ALG_SHARED_KEY)
@@ -2431,10 +2431,10 @@ int rt_ioctl_siwauth(struct net_device *dev,
2431 } 2431 }
2432 else 2432 else
2433 return -EINVAL; 2433 return -EINVAL;
2434 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __FUNCTION__, param->value)); 2434 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __func__, param->value));
2435 break; 2435 break;
2436 case IW_AUTH_WPA_ENABLED: 2436 case IW_AUTH_WPA_ENABLED:
2437 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __FUNCTION__, param->value)); 2437 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __func__, param->value));
2438 break; 2438 break;
2439 default: 2439 default:
2440 return -EOPNOTSUPP; 2440 return -EOPNOTSUPP;
@@ -2542,7 +2542,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2542 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE; 2542 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE;
2543 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx); 2543 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx);
2544 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY)); 2544 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY));
2545 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __FUNCTION__, encoding->flags)); 2545 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __func__, encoding->flags));
2546 } 2546 }
2547 else 2547 else
2548 { 2548 {
@@ -2554,15 +2554,15 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2554 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2554 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
2555 { 2555 {
2556 pAdapter->StaCfg.DefaultKeyId = keyIdx; 2556 pAdapter->StaCfg.DefaultKeyId = keyIdx;
2557 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __FUNCTION__, pAdapter->StaCfg.DefaultKeyId)); 2557 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __func__, pAdapter->StaCfg.DefaultKeyId));
2558 } 2558 }
2559 2559
2560 switch (alg) { 2560 switch (alg) {
2561 case IW_ENCODE_ALG_NONE: 2561 case IW_ENCODE_ALG_NONE:
2562 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __FUNCTION__)); 2562 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __func__));
2563 break; 2563 break;
2564 case IW_ENCODE_ALG_WEP: 2564 case IW_ENCODE_ALG_WEP:
2565 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __FUNCTION__, ext->key_len, keyIdx)); 2565 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __func__, ext->key_len, keyIdx));
2566 if (ext->key_len == MAX_WEP_KEY_SIZE) 2566 if (ext->key_len == MAX_WEP_KEY_SIZE)
2567 { 2567 {
2568 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE; 2568 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE;
@@ -2595,7 +2595,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2595 } 2595 }
2596 break; 2596 break;
2597 case IW_ENCODE_ALG_TKIP: 2597 case IW_ENCODE_ALG_TKIP:
2598 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __FUNCTION__, keyIdx, ext->key_len)); 2598 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __func__, keyIdx, ext->key_len));
2599 if (ext->key_len == 32) 2599 if (ext->key_len == 32)
2600 { 2600 {
2601 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2601 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
diff --git a/drivers/staging/rt2870/tmp60 b/drivers/staging/rt2870/tmp60
index 992096a248c5..975e44484379 100644
--- a/drivers/staging/rt2870/tmp60
+++ b/drivers/staging/rt2870/tmp60
@@ -2224,7 +2224,7 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info,
2224 wrq->length = strlen(extra) + 1; // 1: size of '\0' 2224 wrq->length = strlen(extra) + 1; // 1: size of '\0'
2225 break; 2225 break;
2226 default: 2226 default:
2227 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __FUNCTION__, subcmd)); 2227 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __func__, subcmd));
2228 break; 2228 break;
2229 } 2229 }
2230 2230
@@ -2243,7 +2243,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2243 MLME_DISASSOC_REQ_STRUCT DisAssocReq; 2243 MLME_DISASSOC_REQ_STRUCT DisAssocReq;
2244 MLME_DEAUTH_REQ_STRUCT DeAuthReq; 2244 MLME_DEAUTH_REQ_STRUCT DeAuthReq;
2245 2245
2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __FUNCTION__)); 2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __func__));
2247 2247
2248 if (pMlme == NULL) 2248 if (pMlme == NULL)
2249 return -EINVAL; 2249 return -EINVAL;
@@ -2252,7 +2252,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2252 { 2252 {
2253#ifdef IW_MLME_DEAUTH 2253#ifdef IW_MLME_DEAUTH
2254 case IW_MLME_DEAUTH: 2254 case IW_MLME_DEAUTH:
2255 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __FUNCTION__)); 2255 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __func__));
2256 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid); 2256 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid);
2257 DeAuthReq.Reason = pMlme->reason_code; 2257 DeAuthReq.Reason = pMlme->reason_code;
2258 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT); 2258 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT);
@@ -2267,7 +2267,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2267#endif // IW_MLME_DEAUTH // 2267#endif // IW_MLME_DEAUTH //
2268#ifdef IW_MLME_DISASSOC 2268#ifdef IW_MLME_DISASSOC
2269 case IW_MLME_DISASSOC: 2269 case IW_MLME_DISASSOC:
2270 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __FUNCTION__)); 2270 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __func__));
2271 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid); 2271 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid);
2272 DisAssocReq.Reason = pMlme->reason_code; 2272 DisAssocReq.Reason = pMlme->reason_code;
2273 2273
@@ -2281,7 +2281,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2281 break; 2281 break;
2282#endif // IW_MLME_DISASSOC // 2282#endif // IW_MLME_DISASSOC //
2283 default: 2283 default:
2284 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __FUNCTION__)); 2284 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __func__));
2285 break; 2285 break;
2286 } 2286 }
2287 2287
@@ -2314,7 +2314,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2314 else if (param->value == IW_AUTH_WPA_VERSION_WPA2) 2314 else if (param->value == IW_AUTH_WPA_VERSION_WPA2)
2315 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; 2315 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK;
2316 2316
2317 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2317 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2318 break; 2318 break;
2319 case IW_AUTH_CIPHER_PAIRWISE: 2319 case IW_AUTH_CIPHER_PAIRWISE:
2320 if (param->value == IW_AUTH_CIPHER_NONE) 2320 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2345,7 +2345,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2345 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus; 2345 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus;
2346 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled; 2346 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled;
2347 } 2347 }
2348 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __FUNCTION__, param->value)); 2348 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __func__, param->value));
2349 break; 2349 break;
2350 case IW_AUTH_CIPHER_GROUP: 2350 case IW_AUTH_CIPHER_GROUP:
2351 if (param->value == IW_AUTH_CIPHER_NONE) 2351 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2365,7 +2365,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2365 { 2365 {
2366 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled; 2366 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled;
2367 } 2367 }
2368 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __FUNCTION__, param->value)); 2368 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __func__, param->value));
2369 break; 2369 break;
2370 case IW_AUTH_KEY_MGMT: 2370 case IW_AUTH_KEY_MGMT:
2371 if (param->value == IW_AUTH_KEY_MGMT_802_1X) 2371 if (param->value == IW_AUTH_KEY_MGMT_802_1X)
@@ -2395,7 +2395,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2395 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; 2395 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
2396 STA_PORT_SECURED(pAdapter); 2396 STA_PORT_SECURED(pAdapter);
2397 } 2397 }
2398 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __FUNCTION__, param->value)); 2398 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __func__, param->value));
2399 break; 2399 break;
2400 case IW_AUTH_RX_UNENCRYPTED_EAPOL: 2400 case IW_AUTH_RX_UNENCRYPTED_EAPOL:
2401 break; 2401 break;
@@ -2408,7 +2408,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2408 pAdapter->StaCfg.PairCipher = Ndis802_11WEPDisabled; 2408 pAdapter->StaCfg.PairCipher = Ndis802_11WEPDisabled;
2409 pAdapter->StaCfg.GroupCipher = Ndis802_11WEPDisabled; 2409 pAdapter->StaCfg.GroupCipher = Ndis802_11WEPDisabled;
2410 }*/ 2410 }*/
2411 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __FUNCTION__, param->value)); 2411 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __func__, param->value));
2412 break; 2412 break;
2413 case IW_AUTH_DROP_UNENCRYPTED: 2413 case IW_AUTH_DROP_UNENCRYPTED:
2414 if (param->value != 0) 2414 if (param->value != 0)
@@ -2418,7 +2418,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2418 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; 2418 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
2419 STA_PORT_SECURED(pAdapter); 2419 STA_PORT_SECURED(pAdapter);
2420 } 2420 }
2421 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2421 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2422 break; 2422 break;
2423 case IW_AUTH_80211_AUTH_ALG: 2423 case IW_AUTH_80211_AUTH_ALG:
2424 if (param->value & IW_AUTH_ALG_SHARED_KEY) 2424 if (param->value & IW_AUTH_ALG_SHARED_KEY)
@@ -2431,10 +2431,10 @@ int rt_ioctl_siwauth(struct net_device *dev,
2431 } 2431 }
2432 else 2432 else
2433 return -EINVAL; 2433 return -EINVAL;
2434 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __FUNCTION__, param->value)); 2434 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __func__, param->value));
2435 break; 2435 break;
2436 case IW_AUTH_WPA_ENABLED: 2436 case IW_AUTH_WPA_ENABLED:
2437 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __FUNCTION__, param->value)); 2437 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __func__, param->value));
2438 break; 2438 break;
2439 default: 2439 default:
2440 return -EOPNOTSUPP; 2440 return -EOPNOTSUPP;
@@ -2542,7 +2542,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2542 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE; 2542 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE;
2543 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx); 2543 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx);
2544 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY)); 2544 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY));
2545 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __FUNCTION__, encoding->flags)); 2545 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __func__, encoding->flags));
2546 } 2546 }
2547 else 2547 else
2548 { 2548 {
@@ -2554,15 +2554,15 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2554 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2554 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
2555 { 2555 {
2556 pAdapter->StaCfg.DefaultKeyId = keyIdx; 2556 pAdapter->StaCfg.DefaultKeyId = keyIdx;
2557 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __FUNCTION__, pAdapter->StaCfg.DefaultKeyId)); 2557 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __func__, pAdapter->StaCfg.DefaultKeyId));
2558 } 2558 }
2559 2559
2560 switch (alg) { 2560 switch (alg) {
2561 case IW_ENCODE_ALG_NONE: 2561 case IW_ENCODE_ALG_NONE:
2562 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __FUNCTION__)); 2562 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __func__));
2563 break; 2563 break;
2564 case IW_ENCODE_ALG_WEP: 2564 case IW_ENCODE_ALG_WEP:
2565 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __FUNCTION__, ext->key_len, keyIdx)); 2565 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __func__, ext->key_len, keyIdx));
2566 if (ext->key_len == MAX_WEP_KEY_SIZE) 2566 if (ext->key_len == MAX_WEP_KEY_SIZE)
2567 { 2567 {
2568 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE; 2568 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE;
@@ -2580,7 +2580,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2580 NdisMoveMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, ext->key, ext->key_len); 2580 NdisMoveMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, ext->key, ext->key_len);
2581 break; 2581 break;
2582 case IW_ENCODE_ALG_TKIP: 2582 case IW_ENCODE_ALG_TKIP:
2583 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __FUNCTION__, keyIdx, ext->key_len)); 2583 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __func__, keyIdx, ext->key_len));
2584 if (ext->key_len == 32) 2584 if (ext->key_len == 32)
2585 { 2585 {
2586 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2586 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
diff --git a/drivers/staging/rt2870/tmp61 b/drivers/staging/rt2870/tmp61
index 992096a248c5..975e44484379 100644
--- a/drivers/staging/rt2870/tmp61
+++ b/drivers/staging/rt2870/tmp61
@@ -2224,7 +2224,7 @@ rt_private_show(struct net_device *dev, struct iw_request_info *info,
2224 wrq->length = strlen(extra) + 1; // 1: size of '\0' 2224 wrq->length = strlen(extra) + 1; // 1: size of '\0'
2225 break; 2225 break;
2226 default: 2226 default:
2227 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __FUNCTION__, subcmd)); 2227 DBGPRINT(RT_DEBUG_TRACE, ("%s - unknow subcmd = %d\n", __func__, subcmd));
2228 break; 2228 break;
2229 } 2229 }
2230 2230
@@ -2243,7 +2243,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2243 MLME_DISASSOC_REQ_STRUCT DisAssocReq; 2243 MLME_DISASSOC_REQ_STRUCT DisAssocReq;
2244 MLME_DEAUTH_REQ_STRUCT DeAuthReq; 2244 MLME_DEAUTH_REQ_STRUCT DeAuthReq;
2245 2245
2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __FUNCTION__)); 2246 DBGPRINT(RT_DEBUG_TRACE, ("====> %s\n", __func__));
2247 2247
2248 if (pMlme == NULL) 2248 if (pMlme == NULL)
2249 return -EINVAL; 2249 return -EINVAL;
@@ -2252,7 +2252,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2252 { 2252 {
2253#ifdef IW_MLME_DEAUTH 2253#ifdef IW_MLME_DEAUTH
2254 case IW_MLME_DEAUTH: 2254 case IW_MLME_DEAUTH:
2255 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __FUNCTION__)); 2255 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DEAUTH\n", __func__));
2256 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid); 2256 COPY_MAC_ADDR(DeAuthReq.Addr, pAd->CommonCfg.Bssid);
2257 DeAuthReq.Reason = pMlme->reason_code; 2257 DeAuthReq.Reason = pMlme->reason_code;
2258 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT); 2258 MsgElem.MsgLen = sizeof(MLME_DEAUTH_REQ_STRUCT);
@@ -2267,7 +2267,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2267#endif // IW_MLME_DEAUTH // 2267#endif // IW_MLME_DEAUTH //
2268#ifdef IW_MLME_DISASSOC 2268#ifdef IW_MLME_DISASSOC
2269 case IW_MLME_DISASSOC: 2269 case IW_MLME_DISASSOC:
2270 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __FUNCTION__)); 2270 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - IW_MLME_DISASSOC\n", __func__));
2271 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid); 2271 COPY_MAC_ADDR(DisAssocReq.Addr, pAd->CommonCfg.Bssid);
2272 DisAssocReq.Reason = pMlme->reason_code; 2272 DisAssocReq.Reason = pMlme->reason_code;
2273 2273
@@ -2281,7 +2281,7 @@ int rt_ioctl_siwmlme(struct net_device *dev,
2281 break; 2281 break;
2282#endif // IW_MLME_DISASSOC // 2282#endif // IW_MLME_DISASSOC //
2283 default: 2283 default:
2284 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __FUNCTION__)); 2284 DBGPRINT(RT_DEBUG_TRACE, ("====> %s - Unknow Command\n", __func__));
2285 break; 2285 break;
2286 } 2286 }
2287 2287
@@ -2314,7 +2314,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2314 else if (param->value == IW_AUTH_WPA_VERSION_WPA2) 2314 else if (param->value == IW_AUTH_WPA_VERSION_WPA2)
2315 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK; 2315 pAdapter->StaCfg.AuthMode = Ndis802_11AuthModeWPA2PSK;
2316 2316
2317 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2317 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2318 break; 2318 break;
2319 case IW_AUTH_CIPHER_PAIRWISE: 2319 case IW_AUTH_CIPHER_PAIRWISE:
2320 if (param->value == IW_AUTH_CIPHER_NONE) 2320 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2345,7 +2345,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2345 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus; 2345 pAdapter->StaCfg.OrigWepStatus = pAdapter->StaCfg.WepStatus;
2346 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled; 2346 pAdapter->StaCfg.PairCipher = Ndis802_11Encryption3Enabled;
2347 } 2347 }
2348 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __FUNCTION__, param->value)); 2348 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_PAIRWISE - param->value = %d!\n", __func__, param->value));
2349 break; 2349 break;
2350 case IW_AUTH_CIPHER_GROUP: 2350 case IW_AUTH_CIPHER_GROUP:
2351 if (param->value == IW_AUTH_CIPHER_NONE) 2351 if (param->value == IW_AUTH_CIPHER_NONE)
@@ -2365,7 +2365,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2365 { 2365 {
2366 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled; 2366 pAdapter->StaCfg.GroupCipher = Ndis802_11Encryption3Enabled;
2367 } 2367 }
2368 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __FUNCTION__, param->value)); 2368 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_CIPHER_GROUP - param->value = %d!\n", __func__, param->value));
2369 break; 2369 break;
2370 case IW_AUTH_KEY_MGMT: 2370 case IW_AUTH_KEY_MGMT:
2371 if (param->value == IW_AUTH_KEY_MGMT_802_1X) 2371 if (param->value == IW_AUTH_KEY_MGMT_802_1X)
@@ -2395,7 +2395,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2395 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; 2395 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
2396 STA_PORT_SECURED(pAdapter); 2396 STA_PORT_SECURED(pAdapter);
2397 } 2397 }
2398 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __FUNCTION__, param->value)); 2398 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_KEY_MGMT - param->value = %d!\n", __func__, param->value));
2399 break; 2399 break;
2400 case IW_AUTH_RX_UNENCRYPTED_EAPOL: 2400 case IW_AUTH_RX_UNENCRYPTED_EAPOL:
2401 break; 2401 break;
@@ -2408,7 +2408,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2408 pAdapter->StaCfg.PairCipher = Ndis802_11WEPDisabled; 2408 pAdapter->StaCfg.PairCipher = Ndis802_11WEPDisabled;
2409 pAdapter->StaCfg.GroupCipher = Ndis802_11WEPDisabled; 2409 pAdapter->StaCfg.GroupCipher = Ndis802_11WEPDisabled;
2410 }*/ 2410 }*/
2411 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __FUNCTION__, param->value)); 2411 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_PRIVACY_INVOKED - param->value = %d!\n", __func__, param->value));
2412 break; 2412 break;
2413 case IW_AUTH_DROP_UNENCRYPTED: 2413 case IW_AUTH_DROP_UNENCRYPTED:
2414 if (param->value != 0) 2414 if (param->value != 0)
@@ -2418,7 +2418,7 @@ int rt_ioctl_siwauth(struct net_device *dev,
2418 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED; 2418 //pAdapter->StaCfg.PortSecured = WPA_802_1X_PORT_SECURED;
2419 STA_PORT_SECURED(pAdapter); 2419 STA_PORT_SECURED(pAdapter);
2420 } 2420 }
2421 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __FUNCTION__, param->value)); 2421 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_VERSION - param->value = %d!\n", __func__, param->value));
2422 break; 2422 break;
2423 case IW_AUTH_80211_AUTH_ALG: 2423 case IW_AUTH_80211_AUTH_ALG:
2424 if (param->value & IW_AUTH_ALG_SHARED_KEY) 2424 if (param->value & IW_AUTH_ALG_SHARED_KEY)
@@ -2431,10 +2431,10 @@ int rt_ioctl_siwauth(struct net_device *dev,
2431 } 2431 }
2432 else 2432 else
2433 return -EINVAL; 2433 return -EINVAL;
2434 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __FUNCTION__, param->value)); 2434 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_80211_AUTH_ALG - param->value = %d!\n", __func__, param->value));
2435 break; 2435 break;
2436 case IW_AUTH_WPA_ENABLED: 2436 case IW_AUTH_WPA_ENABLED:
2437 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __FUNCTION__, param->value)); 2437 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_AUTH_WPA_ENABLED - Driver supports WPA!(param->value = %d)\n", __func__, param->value));
2438 break; 2438 break;
2439 default: 2439 default:
2440 return -EOPNOTSUPP; 2440 return -EOPNOTSUPP;
@@ -2542,7 +2542,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2542 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE; 2542 pAdapter->SharedKey[BSS0][keyIdx].CipherAlg = CIPHER_NONE;
2543 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx); 2543 AsicRemoveSharedKeyEntry(pAdapter, 0, (UCHAR)keyIdx);
2544 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY)); 2544 NdisZeroMemory(&pAdapter->SharedKey[BSS0][keyIdx], sizeof(CIPHER_KEY));
2545 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __FUNCTION__, encoding->flags)); 2545 DBGPRINT(RT_DEBUG_TRACE, ("%s::Remove all keys!(encoding->flags = %x)\n", __func__, encoding->flags));
2546 } 2546 }
2547 else 2547 else
2548 { 2548 {
@@ -2554,15 +2554,15 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2554 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2554 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
2555 { 2555 {
2556 pAdapter->StaCfg.DefaultKeyId = keyIdx; 2556 pAdapter->StaCfg.DefaultKeyId = keyIdx;
2557 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __FUNCTION__, pAdapter->StaCfg.DefaultKeyId)); 2557 DBGPRINT(RT_DEBUG_TRACE, ("%s::DefaultKeyId = %d\n", __func__, pAdapter->StaCfg.DefaultKeyId));
2558 } 2558 }
2559 2559
2560 switch (alg) { 2560 switch (alg) {
2561 case IW_ENCODE_ALG_NONE: 2561 case IW_ENCODE_ALG_NONE:
2562 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __FUNCTION__)); 2562 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_NONE\n", __func__));
2563 break; 2563 break;
2564 case IW_ENCODE_ALG_WEP: 2564 case IW_ENCODE_ALG_WEP:
2565 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __FUNCTION__, ext->key_len, keyIdx)); 2565 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_WEP - ext->key_len = %d, keyIdx = %d\n", __func__, ext->key_len, keyIdx));
2566 if (ext->key_len == MAX_WEP_KEY_SIZE) 2566 if (ext->key_len == MAX_WEP_KEY_SIZE)
2567 { 2567 {
2568 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE; 2568 pAdapter->SharedKey[BSS0][keyIdx].KeyLen = MAX_WEP_KEY_SIZE;
@@ -2580,7 +2580,7 @@ int rt_ioctl_siwencodeext(struct net_device *dev,
2580 NdisMoveMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, ext->key, ext->key_len); 2580 NdisMoveMemory(pAdapter->SharedKey[BSS0][keyIdx].Key, ext->key, ext->key_len);
2581 break; 2581 break;
2582 case IW_ENCODE_ALG_TKIP: 2582 case IW_ENCODE_ALG_TKIP:
2583 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __FUNCTION__, keyIdx, ext->key_len)); 2583 DBGPRINT(RT_DEBUG_TRACE, ("%s::IW_ENCODE_ALG_TKIP - keyIdx = %d, ext->key_len = %d\n", __func__, keyIdx, ext->key_len));
2584 if (ext->key_len == 32) 2584 if (ext->key_len == 32)
2585 { 2585 {
2586 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) 2586 if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
diff --git a/drivers/staging/rtl8187se/ieee80211.h b/drivers/staging/rtl8187se/ieee80211.h
index bf06abeeaeb8..58336080ad50 100644
--- a/drivers/staging/rtl8187se/ieee80211.h
+++ b/drivers/staging/rtl8187se/ieee80211.h
@@ -396,7 +396,7 @@ extern u32 ieee80211_debug_level;
396#define IEEE80211_DEBUG(level, fmt, args...) \ 396#define IEEE80211_DEBUG(level, fmt, args...) \
397do { if (ieee80211_debug_level & (level)) \ 397do { if (ieee80211_debug_level & (level)) \
398 printk(KERN_DEBUG "ieee80211: %c %s " fmt, \ 398 printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
399 in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) 399 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
400#else 400#else
401#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) 401#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
402#endif /* CONFIG_IEEE80211_DEBUG */ 402#endif /* CONFIG_IEEE80211_DEBUG */
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
index bf06abeeaeb8..58336080ad50 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
@@ -396,7 +396,7 @@ extern u32 ieee80211_debug_level;
396#define IEEE80211_DEBUG(level, fmt, args...) \ 396#define IEEE80211_DEBUG(level, fmt, args...) \
397do { if (ieee80211_debug_level & (level)) \ 397do { if (ieee80211_debug_level & (level)) \
398 printk(KERN_DEBUG "ieee80211: %c %s " fmt, \ 398 printk(KERN_DEBUG "ieee80211: %c %s " fmt, \
399 in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) 399 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
400#else 400#else
401#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0) 401#define IEEE80211_DEBUG(level, fmt, args...) do {} while (0)
402#endif /* CONFIG_IEEE80211_DEBUG */ 402#endif /* CONFIG_IEEE80211_DEBUG */
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
index 7d890c328b0e..08add385790f 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c
@@ -490,7 +490,7 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv)
490 490
491void ieee80211_ccmp_null(void) 491void ieee80211_ccmp_null(void)
492{ 492{
493// printk("============>%s()\n", __FUNCTION__); 493// printk("============>%s()\n", __func__);
494 return; 494 return;
495} 495}
496static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = { 496static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c
index e560b1e11020..de97bbec0da5 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c
@@ -984,7 +984,7 @@ void ieee80211_crypto_tkip_exit(void)
984 984
985void ieee80211_tkip_null(void) 985void ieee80211_tkip_null(void)
986{ 986{
987// printk("============>%s()\n", __FUNCTION__); 987// printk("============>%s()\n", __func__);
988 return; 988 return;
989} 989}
990 990
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
index f973daeeeb0f..68a22b32fcf0 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c
@@ -380,7 +380,7 @@ void ieee80211_crypto_wep_exit(void)
380 380
381void ieee80211_wep_null(void) 381void ieee80211_wep_null(void)
382{ 382{
383// printk("============>%s()\n", __FUNCTION__); 383// printk("============>%s()\n", __func__);
384 return; 384 return;
385} 385}
386#if 0 386#if 0
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
index 79ec64959cf6..23519b37538f 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
@@ -1635,7 +1635,7 @@ inline void update_network(struct ieee80211_network *dst,
1635 memcpy(dst->rates_ex, src->rates_ex, src->rates_ex_len); 1635 memcpy(dst->rates_ex, src->rates_ex, src->rates_ex_len);
1636 dst->rates_ex_len = src->rates_ex_len; 1636 dst->rates_ex_len = src->rates_ex_len;
1637 dst->HighestOperaRate= src->HighestOperaRate; 1637 dst->HighestOperaRate= src->HighestOperaRate;
1638 //printk("==========>in %s: src->ssid is %s,chan is %d\n",__FUNCTION__,src->ssid,src->channel); 1638 //printk("==========>in %s: src->ssid is %s,chan is %d\n",__func__,src->ssid,src->channel);
1639 1639
1640 //YJ,add,080819,for hidden ap 1640 //YJ,add,080819,for hidden ap
1641 if(src->ssid_len > 0) 1641 if(src->ssid_len > 0)
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index fcffee516d51..e5752f615e09 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -731,7 +731,7 @@ void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee)
731 memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1); 731 memcpy(channel_map, GET_DOT11D_INFO(ieee)->channel_map, MAX_CHANNEL_NUMBER+1);
732#endif 732#endif
733// printk("ieee80211_softmac_scan_wq ENABLE_IPS\n"); 733// printk("ieee80211_softmac_scan_wq ENABLE_IPS\n");
734// printk("in %s\n",__FUNCTION__); 734// printk("in %s\n",__func__);
735 down(&ieee->scan_sem); 735 down(&ieee->scan_sem);
736 736
737 do{ 737 do{
@@ -1785,7 +1785,7 @@ void ieee80211_associate_step1(struct ieee80211_device *ieee)
1785 //If call dev_kfree_skb_any,a warning will ocur.... 1785 //If call dev_kfree_skb_any,a warning will ocur....
1786 //KERNEL: assertion (!atomic_read(&skb->users)) failed at net/core/dev.c (1708) 1786 //KERNEL: assertion (!atomic_read(&skb->users)) failed at net/core/dev.c (1708)
1787 //So ... 1204 by lawrence. 1787 //So ... 1204 by lawrence.
1788 //printk("\nIn %s,line %d call kfree skb.",__FUNCTION__,__LINE__); 1788 //printk("\nIn %s,line %d call kfree skb.",__func__,__LINE__);
1789 //dev_kfree_skb_any(skb);//edit by thomas 1789 //dev_kfree_skb_any(skb);//edit by thomas
1790 } 1790 }
1791} 1791}
@@ -2432,7 +2432,7 @@ inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
2432 } 2432 }
2433 2433
2434 sleep = ieee80211_sta_ps_sleep(ieee,&th, &tl); 2434 sleep = ieee80211_sta_ps_sleep(ieee,&th, &tl);
2435// printk("===>%s,%d[2 wake, 1 sleep, 0 do nothing], ieee->sta_sleep = %d\n",__FUNCTION__, sleep,ieee->sta_sleep); 2435// printk("===>%s,%d[2 wake, 1 sleep, 0 do nothing], ieee->sta_sleep = %d\n",__func__, sleep,ieee->sta_sleep);
2436 /* 2 wake, 1 sleep, 0 do nothing */ 2436 /* 2 wake, 1 sleep, 0 do nothing */
2437 if(sleep == 0) 2437 if(sleep == 0)
2438 goto out; 2438 goto out;
@@ -2510,7 +2510,7 @@ void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success)
2510 /* Null frame with PS bit set */ 2510 /* Null frame with PS bit set */
2511 if(success){ 2511 if(success){
2512 2512
2513 // printk("==================> %s::enter sleep state\n",__FUNCTION__); 2513 // printk("==================> %s::enter sleep state\n",__func__);
2514 ieee->sta_sleep = 1; 2514 ieee->sta_sleep = 1;
2515 ieee->enter_sleep_state(ieee->dev,ieee->ps_th,ieee->ps_tl); 2515 ieee->enter_sleep_state(ieee->dev,ieee->ps_th,ieee->ps_tl);
2516 } 2516 }
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
index 43b8aecee9de..93af37e2d31a 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
@@ -31,7 +31,7 @@ int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info
31{ 31{
32 int ret; 32 int ret;
33 struct iw_freq *fwrq = & wrqu->freq; 33 struct iw_freq *fwrq = & wrqu->freq;
34// printk("in %s\n",__FUNCTION__); 34// printk("in %s\n",__func__);
35 down(&ieee->wx_sem); 35 down(&ieee->wx_sem);
36 36
37 if(ieee->iw_mode == IW_MODE_INFRA){ 37 if(ieee->iw_mode == IW_MODE_INFRA){
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
index c7d9f4fda413..6aad61e78041 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
@@ -663,7 +663,7 @@ int ieee80211_wx_set_encode_ext(struct ieee80211_device *ieee,
663 ret = -EINVAL; 663 ret = -EINVAL;
664 goto done; 664 goto done;
665 } 665 }
666// printk("8-09-08-9=====>%s, alg name:%s\n",__FUNCTION__, alg); 666// printk("8-09-08-9=====>%s, alg name:%s\n",__func__, alg);
667 667
668 ops = ieee80211_get_crypto_ops(alg); 668 ops = ieee80211_get_crypto_ops(alg);
669 if (ops == NULL) { 669 if (ops == NULL) {
@@ -757,7 +757,7 @@ int ieee80211_wx_set_mlme(struct ieee80211_device *ieee,
757 union iwreq_data *wrqu, char *extra) 757 union iwreq_data *wrqu, char *extra)
758{ 758{
759 struct iw_mlme *mlme = (struct iw_mlme *) extra; 759 struct iw_mlme *mlme = (struct iw_mlme *) extra;
760// printk("\ndkgadfslkdjgalskdf===============>%s(), cmd:%x\n", __FUNCTION__, mlme->cmd); 760// printk("\ndkgadfslkdjgalskdf===============>%s(), cmd:%x\n", __func__, mlme->cmd);
761#if 1 761#if 1
762 switch (mlme->cmd) { 762 switch (mlme->cmd) {
763 case IW_MLME_DEAUTH: 763 case IW_MLME_DEAUTH:
@@ -830,7 +830,7 @@ int ieee80211_wx_set_auth(struct ieee80211_device *ieee,
830int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) 830int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
831{ 831{
832#if 0 832#if 0
833 printk("====>%s()\n", __FUNCTION__); 833 printk("====>%s()\n", __func__);
834 { 834 {
835 int i; 835 int i;
836 for (i=0; i<len; i++) 836 for (i=0; i<len; i++)
@@ -866,7 +866,7 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
866 ieee->wpa_ie = NULL; 866 ieee->wpa_ie = NULL;
867 ieee->wpa_ie_len = 0; 867 ieee->wpa_ie_len = 0;
868 } 868 }
869// printk("<=====out %s()\n", __FUNCTION__); 869// printk("<=====out %s()\n", __func__);
870 870
871 return 0; 871 return 0;
872 872
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 00f4df49bc0e..94534955e38b 100644
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -1407,12 +1407,12 @@ void rtl8180_set_chan(struct net_device *dev,short ch)
1407 1407
1408 if((ch > 14) || (ch < 1)) 1408 if((ch > 14) || (ch < 1))
1409 { 1409 {
1410 printk("In %s: Invalid chnanel %d\n", __FUNCTION__, ch); 1410 printk("In %s: Invalid chnanel %d\n", __func__, ch);
1411 return; 1411 return;
1412 } 1412 }
1413 1413
1414 priv->chan=ch; 1414 priv->chan=ch;
1415 //printk("in %s:channel is %d\n",__FUNCTION__,ch); 1415 //printk("in %s:channel is %d\n",__func__,ch);
1416 priv->rf_set_chan(dev,priv->chan); 1416 priv->rf_set_chan(dev,priv->chan);
1417 1417
1418} 1418}
@@ -3656,7 +3656,7 @@ void rtl8180_link_change(struct net_device *dev)
3656void rtl8180_rq_tx_ack(struct net_device *dev){ 3656void rtl8180_rq_tx_ack(struct net_device *dev){
3657 3657
3658 struct r8180_priv *priv = ieee80211_priv(dev); 3658 struct r8180_priv *priv = ieee80211_priv(dev);
3659// printk("====================>%s\n",__FUNCTION__); 3659// printk("====================>%s\n",__func__);
3660 write_nic_byte(dev,CONFIG4,read_nic_byte(dev,CONFIG4)|CONFIG4_PWRMGT); 3660 write_nic_byte(dev,CONFIG4,read_nic_byte(dev,CONFIG4)|CONFIG4_PWRMGT);
3661 priv->ack_tx_to_ieee = 1; 3661 priv->ack_tx_to_ieee = 1;
3662} 3662}
@@ -5448,7 +5448,7 @@ void rtl8180_hw_wakeup_wq(struct net_device *dev)
5448#endif 5448#endif
5449 5449
5450// printk("dev is %d\n",dev); 5450// printk("dev is %d\n",dev);
5451// printk("&*&(^*(&(&=========>%s()\n", __FUNCTION__); 5451// printk("&*&(^*(&(&=========>%s()\n", __func__);
5452 rtl8180_hw_wakeup(dev); 5452 rtl8180_hw_wakeup(dev);
5453 5453
5454} 5454}
@@ -6318,12 +6318,12 @@ priv->txnpring)/8);
6318// printk("NumTxOkTotal is %d\n",priv->NumTxOkTotal++); 6318// printk("NumTxOkTotal is %d\n",priv->NumTxOkTotal++);
6319 } 6319 }
6320#endif 6320#endif
6321 // printk("in function %s:curr_retry_count is %d\n",__FUNCTION__,((*head) & (0x000000ff))); 6321 // printk("in function %s:curr_retry_count is %d\n",__func__,((*head) & (0x000000ff)));
6322 } 6322 }
6323 if(!error){ 6323 if(!error){
6324 priv->NumTxOkBytesTotal += (*(head+3)) & (0x00000fff); 6324 priv->NumTxOkBytesTotal += (*(head+3)) & (0x00000fff);
6325 } 6325 }
6326// printk("in function %s:curr_txokbyte_count is %d\n",__FUNCTION__,(*(head+3)) & (0x00000fff)); 6326// printk("in function %s:curr_txokbyte_count is %d\n",__func__,(*(head+3)) & (0x00000fff));
6327 *head = *head &~ (1<<31); 6327 *head = *head &~ (1<<31);
6328 6328
6329 if((head - begin)/8 == priv->txringcount-1) 6329 if((head - begin)/8 == priv->txringcount-1)
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
index 90a574d46da0..4136b9429597 100644
--- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c
+++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
@@ -1571,7 +1571,7 @@ void rtl8225z4_rf_sleep(struct net_device *dev)
1571 // 1571 //
1572 // Turn off RF power. 1572 // Turn off RF power.
1573 // 1573 //
1574 //printk("=========>%s()\n", __FUNCTION__); 1574 //printk("=========>%s()\n", __func__);
1575 MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS); 1575 MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS);
1576 //mdelay(2); //FIXME 1576 //mdelay(2); //FIXME
1577} 1577}
@@ -1580,7 +1580,7 @@ void rtl8225z4_rf_wakeup(struct net_device *dev)
1580 // 1580 //
1581 // Turn on RF power. 1581 // Turn on RF power.
1582 // 1582 //
1583 //printk("=========>%s()\n", __FUNCTION__); 1583 //printk("=========>%s()\n", __func__);
1584 MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); 1584 MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS);
1585} 1585}
1586#endif 1586#endif
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c
index c77abe502b79..8b3901d87f87 100644
--- a/drivers/staging/rtl8187se/r8180_wx.c
+++ b/drivers/staging/rtl8187se/r8180_wx.c
@@ -1177,7 +1177,7 @@ static int r8180_wx_set_channelplan(struct net_device *dev,
1177 //struct ieee80211_device *ieee = netdev_priv(dev); 1177 //struct ieee80211_device *ieee = netdev_priv(dev);
1178 int *val = (int *)extra; 1178 int *val = (int *)extra;
1179 int i; 1179 int i;
1180 printk("-----in fun %s\n", __FUNCTION__); 1180 printk("-----in fun %s\n", __func__);
1181 1181
1182 if(priv->ieee80211->bHwRadioOff) 1182 if(priv->ieee80211->bHwRadioOff)
1183 return 0; 1183 return 0;
@@ -1235,7 +1235,7 @@ static int r8180_wx_set_forcerate(struct net_device *dev,
1235 1235
1236 down(&priv->wx_sem); 1236 down(&priv->wx_sem);
1237 1237
1238 printk("==============>%s(): forcerate is %d\n",__FUNCTION__,forcerate); 1238 printk("==============>%s(): forcerate is %d\n",__func__,forcerate);
1239 if((forcerate == 2) || (forcerate == 4) || (forcerate == 11) || (forcerate == 22) || (forcerate == 12) || 1239 if((forcerate == 2) || (forcerate == 4) || (forcerate == 11) || (forcerate == 22) || (forcerate == 12) ||
1240 (forcerate == 18) || (forcerate == 24) || (forcerate == 36) || (forcerate == 48) || (forcerate == 72) || 1240 (forcerate == 18) || (forcerate == 24) || (forcerate == 36) || (forcerate == 48) || (forcerate == 72) ||
1241 (forcerate == 96) || (forcerate == 108)) 1241 (forcerate == 96) || (forcerate == 108))
@@ -1260,7 +1260,7 @@ static int r8180_wx_set_enc_ext(struct net_device *dev,
1260{ 1260{
1261 1261
1262 struct r8180_priv *priv = ieee80211_priv(dev); 1262 struct r8180_priv *priv = ieee80211_priv(dev);
1263 //printk("===>%s()\n", __FUNCTION__); 1263 //printk("===>%s()\n", __func__);
1264 1264
1265 int ret=0; 1265 int ret=0;
1266 1266
@@ -1277,7 +1277,7 @@ static int r8180_wx_set_auth(struct net_device *dev,
1277 struct iw_request_info *info, 1277 struct iw_request_info *info,
1278 struct iw_param *data, char *extra) 1278 struct iw_param *data, char *extra)
1279{ 1279{
1280 //printk("====>%s()\n", __FUNCTION__); 1280 //printk("====>%s()\n", __func__);
1281 struct r8180_priv *priv = ieee80211_priv(dev); 1281 struct r8180_priv *priv = ieee80211_priv(dev);
1282 int ret=0; 1282 int ret=0;
1283 1283
@@ -1294,7 +1294,7 @@ static int r8180_wx_set_mlme(struct net_device *dev,
1294 struct iw_request_info *info, 1294 struct iw_request_info *info,
1295 union iwreq_data *wrqu, char *extra) 1295 union iwreq_data *wrqu, char *extra)
1296{ 1296{
1297 //printk("====>%s()\n", __FUNCTION__); 1297 //printk("====>%s()\n", __func__);
1298 1298
1299 int ret=0; 1299 int ret=0;
1300 struct r8180_priv *priv = ieee80211_priv(dev); 1300 struct r8180_priv *priv = ieee80211_priv(dev);
@@ -1315,7 +1315,7 @@ static int r8180_wx_set_gen_ie(struct net_device *dev,
1315 struct iw_request_info *info, 1315 struct iw_request_info *info,
1316 struct iw_point *data, char *extra) 1316 struct iw_point *data, char *extra)
1317{ 1317{
1318// printk("====>%s(), len:%d\n", __FUNCTION__, data->length); 1318// printk("====>%s(), len:%d\n", __func__, data->length);
1319 int ret=0; 1319 int ret=0;
1320 struct r8180_priv *priv = ieee80211_priv(dev); 1320 struct r8180_priv *priv = ieee80211_priv(dev);
1321 1321
@@ -1328,7 +1328,7 @@ static int r8180_wx_set_gen_ie(struct net_device *dev,
1328 ret = ieee80211_wx_set_gen_ie(priv->ieee80211, extra, data->length); 1328 ret = ieee80211_wx_set_gen_ie(priv->ieee80211, extra, data->length);
1329#endif 1329#endif
1330 up(&priv->wx_sem); 1330 up(&priv->wx_sem);
1331 //printk("<======%s(), ret:%d\n", __FUNCTION__, ret); 1331 //printk("<======%s(), ret:%d\n", __func__, ret);
1332 return ret; 1332 return ret;
1333 1333
1334 1334
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-14 22:59:31 -0500