staging: Convert __FUNCTION__ to __func__
[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8192u / r8192U_wx.c
index 61f6620213e2e99881f76835eb51ea3bc6709b15..dab716f765fcfa74733d74c0000555e19de21347 100644 (file)
@@ -127,156 +127,6 @@ static int r8192_wx_get_power(struct net_device *dev,
        return ieee80211_wx_get_power(priv->ieee80211,info,wrqu,extra);
 }
 
-#ifdef JOHN_IOCTL
-u16 read_rtl8225(struct net_device *dev, u8 addr);
-void write_rtl8225(struct net_device *dev, u8 adr, u16 data);
-u32 john_read_rtl8225(struct net_device *dev, u8 adr);
-void _write_rtl8225(struct net_device *dev, u8 adr, u16 data);
-
-static int r8192_wx_read_regs(struct net_device *dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8 addr;
-       u16 data1;
-
-       down(&priv->wx_sem);
-
-
-       get_user(addr,(u8 *)wrqu->data.pointer);
-       data1 = read_rtl8225(dev, addr);
-       wrqu->data.length = data1;
-
-       up(&priv->wx_sem);
-       return 0;
-
-}
-
-static int r8192_wx_write_regs(struct net_device *dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8 addr;
-
-       down(&priv->wx_sem);
-
-       get_user(addr, (u8 *)wrqu->data.pointer);
-       write_rtl8225(dev, addr, wrqu->data.length);
-
-       up(&priv->wx_sem);
-       return 0;
-
-}
-
-void rtl8187_write_phy(struct net_device *dev, u8 adr, u32 data);
-u8 rtl8187_read_phy(struct net_device *dev,u8 adr, u32 data);
-
-static int r8192_wx_read_bb(struct net_device *dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8 databb;
-
-       down(&priv->wx_sem);
-
-       databb = rtl8187_read_phy(dev, (u8)wrqu->data.length, 0x00000000);
-       wrqu->data.length = databb;
-
-       up(&priv->wx_sem);
-       return 0;
-}
-
-void rtl8187_write_phy(struct net_device *dev, u8 adr, u32 data);
-static int r8192_wx_write_bb(struct net_device *dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u8 databb;
-
-       down(&priv->wx_sem);
-
-       get_user(databb, (u8 *)wrqu->data.pointer);
-       rtl8187_write_phy(dev, wrqu->data.length, databb);
-
-       up(&priv->wx_sem);
-       return 0;
-
-}
-
-
-static int r8192_wx_write_nicb(struct net_device *dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u32 addr;
-
-       down(&priv->wx_sem);
-
-       get_user(addr, (u32 *)wrqu->data.pointer);
-       write_nic_byte(dev, addr, wrqu->data.length);
-
-       up(&priv->wx_sem);
-       return 0;
-
-}
-static int r8192_wx_read_nicb(struct net_device *dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       u32 addr;
-       u16 data1;
-
-       down(&priv->wx_sem);
-
-       get_user(addr,(u32 *)wrqu->data.pointer);
-       read_nic_byte(dev, addr, &data1);
-       wrqu->data.length = data1;
-
-       up(&priv->wx_sem);
-       return 0;
-}
-
-static int r8192_wx_get_ap_status(struct net_device *dev,
-                              struct iw_request_info *info,
-                              union iwreq_data *wrqu, char *extra)
-{
-       struct r8192_priv *priv = ieee80211_priv(dev);
-       struct ieee80211_device *ieee = priv->ieee80211;
-       struct ieee80211_network *target;
-       int name_len;
-
-       down(&priv->wx_sem);
-
-       //count the length of input ssid
-       for(name_len=0 ; ((char *)wrqu->data.pointer)[name_len]!='\0' ; name_len++);
-
-       //search for the corresponding info which is received
-       list_for_each_entry(target, &ieee->network_list, list) {
-               if ( (target->ssid_len == name_len) &&
-                    (strncmp(target->ssid, (char *)wrqu->data.pointer, name_len)==0)){
-                       if(target->wpa_ie_len>0 || target->rsn_ie_len>0 )
-                               //set flags=1 to indicate this ap is WPA
-                               wrqu->data.flags = 1;
-                       else wrqu->data.flags = 0;
-
-
-               break;
-               }
-       }
-
-       up(&priv->wx_sem);
-       return 0;
-}
-
-
-
-#endif
 static int r8192_wx_force_reset(struct net_device *dev,
                struct iw_request_info *info,
                union iwreq_data *wrqu, char *extra)
@@ -285,7 +135,7 @@ static int r8192_wx_force_reset(struct net_device *dev,
 
        down(&priv->wx_sem);
 
-       printk("%s(): force reset ! extra is %d\n",__FUNCTION__, *extra);
+       printk("%s(): force reset ! extra is %d\n",__func__, *extra);
        priv->force_reset = *extra;
        up(&priv->wx_sem);
        return 0;
@@ -425,9 +275,8 @@ static int rtl8180_wx_get_range(struct net_device *dev,
 
        range->num_bitrates = RATE_COUNT;
 
-       for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) {
+       for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++)
                range->bitrate[i] = rtl8180_rates[i];
-       }
 
        range->min_frag = MIN_FRAG_THRESHOLD;
        range->max_frag = MAX_FRAG_THRESHOLD;
@@ -470,10 +319,8 @@ static int rtl8180_wx_get_range(struct net_device *dev,
        }
        range->num_frequency = val;
        range->num_channels = val;
-#if WIRELESS_EXT > 17
        range->enc_capa = IW_ENC_CAPA_WPA|IW_ENC_CAPA_WPA2|
                          IW_ENC_CAPA_CIPHER_TKIP|IW_ENC_CAPA_CIPHER_CCMP;
-#endif
        tmp->scan_capa = 0x01;
        return 0;
 }
@@ -883,7 +730,6 @@ exit:
        return err;
 }
 
-#if (WIRELESS_EXT >= 18)
 //hw security need to reorganized.
 static int r8192_wx_set_enc_ext(struct net_device *dev,
                                        struct iw_request_info *info,
@@ -892,7 +738,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
        int ret=0;
        struct r8192_priv *priv = ieee80211_priv(dev);
        struct ieee80211_device *ieee = priv->ieee80211;
-       //printk("===>%s()\n", __FUNCTION__);
+       //printk("===>%s()\n", __func__);
 
 
        down(&priv->wx_sem);
@@ -971,7 +817,7 @@ static int r8192_wx_set_auth(struct net_device *dev,
                                        union iwreq_data *data, char *extra)
 {
        int ret=0;
-       //printk("====>%s()\n", __FUNCTION__);
+       //printk("====>%s()\n", __func__);
        struct r8192_priv *priv = ieee80211_priv(dev);
        down(&priv->wx_sem);
        ret = ieee80211_wx_set_auth(priv->ieee80211, info, &(data->param), extra);
@@ -983,7 +829,7 @@ static int r8192_wx_set_mlme(struct net_device *dev,
                                        struct iw_request_info *info,
                                        union iwreq_data *wrqu, char *extra)
 {
-       //printk("====>%s()\n", __FUNCTION__);
+       //printk("====>%s()\n", __func__);
 
        int ret=0;
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -993,18 +839,18 @@ static int r8192_wx_set_mlme(struct net_device *dev,
        up(&priv->wx_sem);
        return ret;
 }
-#endif
+
 static int r8192_wx_set_gen_ie(struct net_device *dev,
                                        struct iw_request_info *info,
                                        union iwreq_data *data, char *extra)
 {
-          //printk("====>%s(), len:%d\n", __FUNCTION__, data->length);
+          //printk("====>%s(), len:%d\n", __func__, data->length);
        int ret=0;
        struct r8192_priv *priv = ieee80211_priv(dev);
        down(&priv->wx_sem);
        ret = ieee80211_wx_set_gen_ie(priv->ieee80211, extra, data->data.length);
        up(&priv->wx_sem);
-       //printk("<======%s(), ret:%d\n", __FUNCTION__, ret);
+       //printk("<======%s(), ret:%d\n", __func__, ret);
        return ret;
 
 
@@ -1041,11 +887,7 @@ static iw_handler r8192_wx_handlers[] =
        NULL,                     /* SIOCWIWTHRSPY */
        r8192_wx_set_wap,         /* SIOCSIWAP */
        r8192_wx_get_wap,         /* SIOCGIWAP */
-#if (WIRELESS_EXT >= 18)
        r8192_wx_set_mlme,                     /* MLME-- */
-#else
-        NULL,
-#endif
        dummy,                     /* SIOCGIWAPLIST -- deprecated */
        r8192_wx_set_scan,        /* SIOCSIWSCAN */
        r8192_wx_get_scan,        /* SIOCGIWSCAN */
@@ -1074,17 +916,10 @@ static iw_handler r8192_wx_handlers[] =
        r8192_wx_set_gen_ie,//NULL,                     /* SIOCSIWGENIE */
        NULL,                   /* SIOCSIWGENIE */
 
-#if (WIRELESS_EXT >= 18)
        r8192_wx_set_auth,//NULL,                       /* SIOCSIWAUTH */
        NULL,//r8192_wx_get_auth,//NULL,                        /* SIOCSIWAUTH */
        r8192_wx_set_enc_ext,                   /* SIOCSIWENCODEEXT */
        NULL,//r8192_wx_get_enc_ext,//NULL,                     /* SIOCSIWENCODEEXT */
-#else
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-#endif
        NULL,                   /* SIOCSIWPMKSA */
        NULL,                    /*---hole---*/
 
@@ -1106,46 +941,7 @@ static const struct iw_priv_args r8192_private_args[] = {
        {
                SIOCIWFIRSTPRIV + 0x2,
                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "rawtx"
-       }
-#ifdef JOHN_IOCTL
-       ,
-       {
-               SIOCIWFIRSTPRIV + 0x3,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "readRF"
-       }
-       ,
-       {
-               SIOCIWFIRSTPRIV + 0x4,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "writeRF"
-       }
-       ,
-       {
-               SIOCIWFIRSTPRIV + 0x5,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "readBB"
-       }
-       ,
-       {
-               SIOCIWFIRSTPRIV + 0x6,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "writeBB"
-       }
-       ,
-       {
-               SIOCIWFIRSTPRIV + 0x7,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "readnicb"
-       }
-       ,
-       {
-               SIOCIWFIRSTPRIV + 0x8,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "writenicb"
-       }
-       ,
-       {
-               SIOCIWFIRSTPRIV + 0x9,
-               IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "apinfo"
-       }
-
-#endif
-       ,
+       },
        {
                SIOCIWFIRSTPRIV + 0x3,
                IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "forcereset"
@@ -1163,20 +959,10 @@ static iw_handler r8192_private_handler[] = {
 //     r8192_wx_set_monitor_type,
        r8192_wx_set_scan_type,
        r8192_wx_set_rawtx,
-#ifdef JOHN_IOCTL
-       r8192_wx_read_regs,
-       r8192_wx_write_regs,
-       r8192_wx_read_bb,
-       r8192_wx_write_bb,
-       r8192_wx_read_nicb,
-       r8192_wx_write_nicb,
-       r8192_wx_get_ap_status,
-#endif
        //r8192_wx_null,
        r8192_wx_force_reset,
 };
 
-//#if WIRELESS_EXT >= 17
 struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -1205,7 +991,6 @@ struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
        wstats->qual.updated = IW_QUAL_ALL_UPDATED| IW_QUAL_DBM;
        return wstats;
 }
-//#endif
 
 
 struct iw_handler_def  r8192_wx_handlers_def={
@@ -1214,8 +999,6 @@ struct iw_handler_def  r8192_wx_handlers_def={
        .private = r8192_private_handler,
        .num_private = ARRAY_SIZE(r8192_private_handler),
        .num_private_args = sizeof(r8192_private_args) / sizeof(struct iw_priv_args),
-#if WIRELESS_EXT >= 17
        .get_wireless_stats = r8192_get_wireless_stats,
-#endif
        .private_args = (struct iw_priv_args *)r8192_private_args,
 };