rtl8188eu: Remove CONFIG_MP_IWPRIV_SUPPORT - selected

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-26 22:04:40 -05:00
parent 90575aca87
commit e520b8da19
2 changed files with 21 additions and 41 deletions

View file

@ -58,17 +58,8 @@
#define RTL8188E_RX_PACKET_INCLUDE_CRC 0 #define RTL8188E_RX_PACKET_INCLUDE_CRC 0
#define SUPPORTED_BLOCK_IO
#define CONFIG_OUT_EP_WIFI_MODE 0
#define MP_DRIVER 1 #define MP_DRIVER 1
#define CONFIG_MP_IWPRIV_SUPPORT
/*
* Platform Related Config
*/
/* /*
* Outsource Related Config * Outsource Related Config
*/ */

View file

@ -7972,7 +7972,6 @@ exit:
return err; return err;
} }
#if defined(CONFIG_MP_IWPRIV_SUPPORT)
/* /*
* Input Format: %s,%d,%d * Input Format: %s,%d,%d
* %s is width, could be * %s is width, could be
@ -7993,7 +7992,6 @@ static int rtw_mp_write_reg(struct net_device *dev,
int ret; int ret;
struct adapter * padapter = rtw_netdev_priv(dev); struct adapter * padapter = rtw_netdev_priv(dev);
pch = extra; pch = extra;
pnext = strpbrk(pch, " ,.-"); pnext = strpbrk(pch, " ,.-");
if (pnext == NULL) return -EINVAL; if (pnext == NULL) return -EINVAL;
@ -8014,29 +8012,29 @@ static int rtw_mp_write_reg(struct net_device *dev,
ret = 0; ret = 0;
width = width_str[0]; width = width_str[0];
switch (width) { switch (width) {
case 'b': case 'b':
// 1 byte // 1 byte
if (data > 0xFF) { if (data > 0xFF) {
ret = -EINVAL;
break;
}
rtw_write8(padapter, addr, data);
break;
case 'w':
// 2 bytes
if (data > 0xFFFF) {
ret = -EINVAL;
break;
}
rtw_write16(padapter, addr, data);
break;
case 'd':
// 4 bytes
rtw_write32(padapter, addr, data);
break;
default:
ret = -EINVAL; ret = -EINVAL;
break; break;
}
rtw_write8(padapter, addr, data);
break;
case 'w':
// 2 bytes
if (data > 0xFFFF) {
ret = -EINVAL;
break;
}
rtw_write16(padapter, addr, data);
break;
case 'd':
// 4 bytes
rtw_write32(padapter, addr, data);
break;
default:
ret = -EINVAL;
break;
} }
return ret; return ret;
@ -8100,13 +8098,11 @@ static int rtw_mp_read_reg(struct net_device *dev,
switch (width) { switch (width) {
case 'b': case 'b':
// 1 byte // 1 byte
// *(u8*)data = rtw_read8(padapter, addr);
sprintf(extra, "%d\n", rtw_read8(padapter, addr)); sprintf(extra, "%d\n", rtw_read8(padapter, addr));
wrqu->length = strlen(extra); wrqu->length = strlen(extra);
break; break;
case 'w': case 'w':
// 2 bytes // 2 bytes
//*(u16*)data = rtw_read16(padapter, addr);
sprintf(data, "%04x\n", rtw_read16(padapter, addr)); sprintf(data, "%04x\n", rtw_read16(padapter, addr));
for (i=0 ; i <= strlen(data) ; i++) { for (i=0 ; i <= strlen(data) ; i++) {
if (i%2==0) { if (i%2==0) {
@ -8138,7 +8134,6 @@ static int rtw_mp_read_reg(struct net_device *dev,
break; break;
case 'd': case 'd':
// 4 bytes // 4 bytes
//*data = rtw_read32(padapter, addr);
sprintf(data, "%08x", rtw_read32(padapter, addr)); sprintf(data, "%08x", rtw_read32(padapter, addr));
//add read data format blank //add read data format blank
for (i=0 ; i <= strlen(data) ; i++) { for (i=0 ; i <= strlen(data) ; i++) {
@ -8188,10 +8183,6 @@ static int rtw_mp_read_reg(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
struct iw_point *wrqu, char *extra) struct iw_point *wrqu, char *extra)
{ {
/*static int rtw_mp_write_rf(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
*/
u32 path, addr, data; u32 path, addr, data;
int ret; int ret;
struct adapter * padapter = rtw_netdev_priv(dev); struct adapter * padapter = rtw_netdev_priv(dev);
@ -9214,8 +9205,6 @@ static int rtw_mp_get(struct net_device *dev,
return 0; return 0;
} }
#endif //#if defined(CONFIG_MP_IWPRIV_SUPPORT)
static int rtw_wfd_tdls_enable(struct net_device *dev, static int rtw_wfd_tdls_enable(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)