From: Joe Perches <joe@xxxxxxxxxxx>
Remove obfuscating A_CHAR uses, just use char.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/ath6kl/include/a_debug.h | 12 ++++----
drivers/staging/ath6kl/include/athbtfilter.h | 2 +-
.../include/common/regulatory/reg_dbschema.h | 12 ++++----
drivers/staging/ath6kl/include/common/wmi.h | 2 +-
drivers/staging/ath6kl/include/wmi_api.h | 2 +-
drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 12 ++++----
.../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 16 +++++-----
drivers/staging/ath6kl/miscdrv/common_drv.c | 12 ++++----
drivers/staging/ath6kl/os/linux/ar6000_android.c | 2 +-
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 8 +++---
drivers/staging/ath6kl/os/linux/eeprom.c | 2 +-
.../staging/ath6kl/os/linux/include/ar6000_drv.h | 4 +-
.../staging/ath6kl/os/linux/include/athdrv_linux.h | 2 +-
drivers/staging/ath6kl/os/linux/ioctl.c | 28 ++++++++++----------
drivers/staging/ath6kl/os/linux/wireless_ext.c | 6 ++--
drivers/staging/ath6kl/wmi/wmi.c | 2 +-
16 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/drivers/staging/ath6kl/include/a_debug.h b/drivers/staging/ath6kl/include/a_debug.h
index 007010c..4cc7b6b 100644
--- a/drivers/staging/ath6kl/include/a_debug.h
+++ b/drivers/staging/ath6kl/include/a_debug.h
@@ -120,15 +120,15 @@ void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
typedef struct {
A_UINT32 Mask;
- A_CHAR Description[ATH_DEBUG_MAX_MASK_DESC_LENGTH];
+ char Description[ATH_DEBUG_MAX_MASK_DESC_LENGTH];
} ATH_DEBUG_MASK_DESCRIPTION;
#define ATH_DEBUG_INFO_FLAGS_REGISTERED (1 << 0)
typedef struct _ATH_DEBUG_MODULE_DBG_INFO{
struct _ATH_DEBUG_MODULE_DBG_INFO *pNext;
- A_CHAR ModuleName[16];
- A_CHAR ModuleDescription[ATH_DEBUG_MAX_MOD_DESC_LENGTH];
+ char ModuleName[16];
+ char ModuleDescription[ATH_DEBUG_MAX_MOD_DESC_LENGTH];
A_UINT32 Flags;
A_UINT32 CurrentMask;
int MaxDescriptions;
@@ -181,9 +181,9 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo);
#endif
-int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask);
-int a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask);
-void a_dump_module_debug_info_by_name(A_CHAR *module_name);
+int a_get_module_mask(char *module_name, A_UINT32 *pMask);
+int a_set_module_mask(char *module_name, A_UINT32 Mask);
+void a_dump_module_debug_info_by_name(char *module_name);
void a_module_debug_support_init(void);
void a_module_debug_support_cleanup(void);
diff --git a/drivers/staging/ath6kl/include/athbtfilter.h b/drivers/staging/ath6kl/include/athbtfilter.h
index dbe68bb..378f967 100644
--- a/drivers/staging/ath6kl/include/athbtfilter.h
+++ b/drivers/staging/ath6kl/include/athbtfilter.h
@@ -65,7 +65,7 @@ typedef struct _ATHBT_FILTER_INSTANCE {
#ifdef UNDER_CE
WCHAR *pWlanAdapterName; /* filled in by user */
#else
- char *pWlanAdapterName; /* filled in by user */
+ char *pWlanAdapterName; /* filled in by user */
#endif /* UNDER_CE */
int FilterEnabled; /* filtering is enabled */
int Attached; /* filter library is attached */
diff --git a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
index c6844d6..325d205 100644
--- a/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
+++ b/drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h
@@ -125,11 +125,11 @@ enum searchType {
*/
typedef PREPACK struct dbMasterTable_t { /* Hold ptrs to Table data structures */
A_UCHAR numOfEntries;
- A_CHAR entrySize; /* Entry size per table row */
- A_CHAR searchType; /* Index based access or key based */
- A_CHAR reserved[3]; /* for alignment */
+ char entrySize; /* Entry size per table row */
+ char searchType; /* Index based access or key based */
+ char reserved[3]; /* for alignment */
A_UINT16 tableSize; /* Size of this table */
- A_CHAR *dataPtr; /* Ptr to the actual Table */
+ char *dataPtr; /* Ptr to the actual Table */
} POSTPACK dbMasterTable; /* Master table - table of tables */
@@ -190,8 +190,8 @@ typedef PREPACK struct reg_dmn_pair_mapping {
typedef PREPACK struct {
A_UINT16 countryCode;
A_UINT16 regDmnEnum;
- A_CHAR isoName[3];
- A_CHAR allowMode; /* what mode is allowed - bit 0: OFDM; bit 1: MCS_HT20; bit 2: MCS_HT40_A; bit 3: MCS_HT40_G */
+ char isoName[3];
+ char allowMode; /* what mode is allowed - bit 0: OFDM; bit 1: MCS_HT20; bit 2: MCS_HT40_A; bit 3: MCS_HT40_G */
} POSTPACK COUNTRY_CODE_TO_ENUM_RD;
/* lower 16 bits of ht40ChanMask */
diff --git a/drivers/staging/ath6kl/include/common/wmi.h b/drivers/staging/ath6kl/include/common/wmi.h
index eb8f7ba..70758bf 100644
--- a/drivers/staging/ath6kl/include/common/wmi.h
+++ b/drivers/staging/ath6kl/include/common/wmi.h
@@ -782,7 +782,7 @@ typedef PREPACK struct {
typedef PREPACK struct {
A_UINT32 opcode;
A_UINT32 length;
- A_CHAR buffer[1]; /* WMI_SET_PARAMS */
+ char buffer[1]; /* WMI_SET_PARAMS */
} POSTPACK WMI_SET_PARAMS_CMD;
typedef PREPACK struct {
diff --git a/drivers/staging/ath6kl/include/wmi_api.h b/drivers/staging/ath6kl/include/wmi_api.h
index ee22706..ae720a0 100644
--- a/drivers/staging/ath6kl/include/wmi_api.h
+++ b/drivers/staging/ath6kl/include/wmi_api.h
@@ -310,7 +310,7 @@ int wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
int wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status);
int
-wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer);
+wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, char *buffer);
int
wmi_set_mcast_filter_cmd(struct wmi_t *wmip, A_UINT8 dot1, A_UINT8 dot2, A_UINT8 dot3, A_UINT8 dot4);
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
index f61dd44..1761092 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kconfig.c
@@ -277,7 +277,7 @@ static int AR3KConfigureHCIBaud(AR3K_CONFIG_INFO *pConfig)
static int AR3KExitMinBoot(AR3K_CONFIG_INFO *pConfig)
{
int status;
- A_CHAR exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
+ char exitMinBootCmd[] = {0x25,0xFC,0x0c,0x03,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00};
A_UINT8 *pEvent = NULL;
A_UINT8 *pBufferToFree = NULL;
@@ -338,7 +338,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
{
int status;
/* AR3K vendor specific command for Host Wakeup Config */
- A_CHAR hostWakeupConfig[] = {0x31,0xFC,0x18,
+ char hostWakeupConfig[] = {0x31,0xFC,0x18,
0x02,0x00,0x00,0x00,
0x01,0x00,0x00,0x00,
TLPM_DEFAULT_IDLE_TIMEOUT_LSB,TLPM_DEFAULT_IDLE_TIMEOUT_MSB,0x00,0x00, //idle timeout in ms
@@ -346,7 +346,7 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
TLPM_DEFAULT_WAKEUP_TIMEOUT_MS,0x00,0x00,0x00, //wakeup timeout in ms
0x00,0x00,0x00,0x00};
/* AR3K vendor specific command for Target Wakeup Config */
- A_CHAR targetWakeupConfig[] = {0x31,0xFC,0x18,
+ char targetWakeupConfig[] = {0x31,0xFC,0x18,
0x04,0x00,0x00,0x00,
0x01,0x00,0x00,0x00,
TLPM_DEFAULT_IDLE_TIMEOUT_LSB,TLPM_DEFAULT_IDLE_TIMEOUT_MSB,0x00,0x00, //idle timeout in ms
@@ -354,13 +354,13 @@ static int AR3KEnableTLPM(AR3K_CONFIG_INFO *pConfig)
TLPM_DEFAULT_WAKEUP_TIMEOUT_MS,0x00,0x00,0x00, //wakeup timeout in ms
0x00,0x00,0x00,0x00};
/* AR3K vendor specific command for Host Wakeup Enable */
- A_CHAR hostWakeupEnable[] = {0x31,0xFC,0x4,
+ char hostWakeupEnable[] = {0x31,0xFC,0x4,
0x01,0x00,0x00,0x00};
/* AR3K vendor specific command for Target Wakeup Enable */
- A_CHAR targetWakeupEnable[] = {0x31,0xFC,0x4,
+ char targetWakeupEnable[] = {0x31,0xFC,0x4,
0x06,0x00,0x00,0x00};
/* AR3K vendor specific command for Sleep Enable */
- A_CHAR sleepEnable[] = {0x4,0xFC,0x1,
+ char sleepEnable[] = {0x4,0xFC,0x1,
0x1};
A_UINT8 *pEvent = NULL;
A_UINT8 *pBufferToFree = NULL;
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
index b3013c5..7ac1c36 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
@@ -129,7 +129,7 @@ tRamPatch RamPatch[MAX_NUM_PATCH_ENTRY];
int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat);
char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos);
-char * AthGetLine(char * buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos);
+char *AthGetLine(char *buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos);
static int AthPSCreateHCICommand(A_UCHAR Opcode, A_UINT32 Param1,PSCmdPacket *PSPatchPacket,A_UINT32 *index);
/* Function to reads the next character from the input buffer */
@@ -146,7 +146,7 @@ char AthReadChar(A_UCHAR *buffer, A_UINT32 len,A_UINT32 *pos)
}
}
/* PS parser helper function */
-unsigned int uGetInputDataFormat(char* pCharLine, ST_PS_DATA_FORMAT *pstFormat)
+unsigned int uGetInputDataFormat(char *pCharLine, ST_PS_DATA_FORMAT *pstFormat)
{
if(pCharLine[0] != '[') {
pstFormat->eDataType = eHex;
@@ -317,8 +317,8 @@ unsigned int uReadDataInSection(char *pCharLine, ST_PS_DATA_FORMAT stPS_DataForm
}
int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat)
{
- char *Buffer;
- char *pCharLine;
+ char *Buffer;
+ char *pCharLine;
A_UINT8 TagCount;
A_UINT16 ByteCount;
A_UINT8 ParseSection=RAM_PS_SECTION;
@@ -558,7 +558,7 @@ int AthParseFilesUnified(A_UCHAR *srcbuffer,A_UINT32 srclen, int FileFormat)
/********************/
-int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer)
+int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char *buffer)
{
unsigned char ch;
@@ -582,8 +582,8 @@ int GetNextTwoChar(A_UCHAR *srcbuffer,A_UINT32 len, A_UINT32 *pos, char * buffer
int AthDoParsePatch(A_UCHAR *patchbuffer, A_UINT32 patchlen)
{
- char Byte[3];
- char Line[MAX_BYTE_LENGTH + 1];
+ char Byte[3];
+ char Line[MAX_BYTE_LENGTH + 1];
int ByteCount,ByteCount_Org;
int count;
int i,j,k;
@@ -713,7 +713,7 @@ int AthDoParsePS(A_UCHAR *srcbuffer, A_UINT32 srclen)
return status;
}
-char * AthGetLine(char * buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos)
+char *AthGetLine(char *buffer, int maxlen, A_UCHAR *srcbuffer,A_UINT32 len,A_UINT32 *pos)
{
int count;
diff --git a/drivers/staging/ath6kl/miscdrv/common_drv.c b/drivers/staging/ath6kl/miscdrv/common_drv.c
index 94b4eb0..1710785 100644
--- a/drivers/staging/ath6kl/miscdrv/common_drv.c
+++ b/drivers/staging/ath6kl/miscdrv/common_drv.c
@@ -799,8 +799,8 @@ ar6002_REV1_reset_force_host (HIF_DEVICE *hifDevice)
void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription)
{
- A_CHAR stream[60];
- A_CHAR byteOffsetStr[10];
+ char stream[60];
+ char byteOffsetStr[10];
A_UINT32 i;
A_UINT16 offset, count, byteOffset;
@@ -868,7 +868,7 @@ void a_dump_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo)
}
-static ATH_DEBUG_MODULE_DBG_INFO *FindModule(A_CHAR *module_name)
+static ATH_DEBUG_MODULE_DBG_INFO *FindModule(char *module_name)
{
ATH_DEBUG_MODULE_DBG_INFO *pInfo = g_pModuleInfoHead;
@@ -909,7 +909,7 @@ void a_register_module_debug_info(ATH_DEBUG_MODULE_DBG_INFO *pInfo)
A_MUTEX_UNLOCK(&g_ModuleListLock);
}
-void a_dump_module_debug_info_by_name(A_CHAR *module_name)
+void a_dump_module_debug_info_by_name(char *module_name)
{
ATH_DEBUG_MODULE_DBG_INFO *pInfo = g_pModuleInfoHead;
@@ -934,7 +934,7 @@ void a_dump_module_debug_info_by_name(A_CHAR *module_name)
}
-int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask)
+int a_get_module_mask(char *module_name, A_UINT32 *pMask)
{
ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name);
@@ -946,7 +946,7 @@ int a_get_module_mask(A_CHAR *module_name, A_UINT32 *pMask)
return A_OK;
}
-int a_set_module_mask(A_CHAR *module_name, A_UINT32 Mask)
+int a_set_module_mask(char *module_name, A_UINT32 Mask)
{
ATH_DEBUG_MODULE_DBG_INFO *pInfo = FindModule(module_name);
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_android.c b/drivers/staging/ath6kl/os/linux/ar6000_android.c
index 7759a3d..88591d7 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_android.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_android.c
@@ -155,7 +155,7 @@ int android_logger_lv(void *module, int mask)
}
}
-static int android_readwrite_file(const A_CHAR *filename, A_CHAR *rbuf, const A_CHAR *wbuf, size_t length)
+static int android_readwrite_file(const char *filename, char *rbuf, const char *wbuf, size_t length)
{
int ret = 0;
struct file *filp = (struct file *)-ENOENT;
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index 5bf505c..b190947 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -970,7 +970,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
ptr_mac[5] = random32() & 0xff;
if ((A_REQUEST_FIRMWARE(&softmac_entry, "softmac", ((struct device *)ar->osDevInfo.pOSDevice))) == 0)
{
- A_CHAR *macbuf = A_MALLOC_NOWAIT(softmac_entry->size+1);
+ char *macbuf = A_MALLOC_NOWAIT(softmac_entry->size+1);
if (macbuf) {
unsigned int softmac[6];
memcpy(macbuf, softmac_entry->data, softmac_entry->size);
@@ -1190,7 +1190,7 @@ ar6000_sysfs_bmi_get_config(AR_SOFTC_T *ar, A_UINT32 mode)
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("BMI: Requesting device specific configuration\n"));
if (mode == WLAN_INIT_MODE_UDEV) {
- A_CHAR version[16];
+ char version[16];
const struct firmware *fw_entry;
/* Get config using udev through a script in user space */
@@ -2344,7 +2344,7 @@ ar6000_close(struct net_device *dev)
/* connect to a service */
static int ar6000_connectservice(AR_SOFTC_T *ar,
HTC_SERVICE_CONNECT_REQ *pConnect,
- char *pDesc)
+ char *pDesc)
{
int status;
HTC_SERVICE_CONNECT_RESP response;
@@ -5941,7 +5941,7 @@ rssi_compensation_reverse_calc(AR_SOFTC_T *ar, A_INT16 rssi, bool Above)
void ap_wapi_rekey_event(AR_SOFTC_T *ar, A_UINT8 type, A_UINT8 *mac)
{
union iwreq_data wrqu;
- A_CHAR buf[20];
+ char buf[20];
A_MEMZERO(buf, sizeof(buf));
diff --git a/drivers/staging/ath6kl/os/linux/eeprom.c b/drivers/staging/ath6kl/os/linux/eeprom.c
index fd0e083..75eb092 100644
--- a/drivers/staging/ath6kl/os/linux/eeprom.c
+++ b/drivers/staging/ath6kl/os/linux/eeprom.c
@@ -103,7 +103,7 @@ wmic_ether_aton(const char *orig, A_UINT8 *eth)
}
static void
-update_mac(unsigned char* eeprom, int size, unsigned char* macaddr)
+update_mac(unsigned char *eeprom, int size, unsigned char *macaddr)
{
int i;
A_UINT16* ptr = (A_UINT16*)(eeprom+4);
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 233a1d3..6b34629 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -672,8 +672,8 @@ static inline void *ar6k_priv(struct net_device *dev)
#define arEndpoint2RawStreamID(ar,ep) (ar)->arRawHtc->arEp2RawMapping[(ep)]
struct ar_giwscan_param {
- char *current_ev;
- char *end_buf;
+ char *current_ev;
+ char *end_buf;
A_UINT32 bytes_needed;
struct iw_request_info *info;
};
diff --git a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
index 15b6b08..e9f7135 100644
--- a/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
+++ b/drivers/staging/ath6kl/os/linux/include/athdrv_linux.h
@@ -1198,7 +1198,7 @@ struct prof_count_s {
/* AR6000_XIOCTL_MODULE_DEBUG_GET_MASK */
/* AR6000_XIOCTL_DUMP_MODULE_DEBUG_INFO */
struct drv_debug_module_s {
- A_CHAR modulename[128]; /* name of module */
+ char modulename[128]; /* name of module */
A_UINT32 mask; /* new mask to set .. or .. current mask */
};
diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
index a120a5c..4403d1a 100644
--- a/drivers/staging/ath6kl/os/linux/ioctl.c
+++ b/drivers/staging/ath6kl/os/linux/ioctl.c
@@ -937,7 +937,7 @@ ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
}
static int
-ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata)
+ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_VOICE_PKT_SIZE_CMD cmd;
@@ -963,7 +963,7 @@ ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata)
}
static int
-ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata)
+ar6000_xioctl_set_max_sp_len(struct net_device *dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_MAX_SP_LEN_CMD cmd;
@@ -989,7 +989,7 @@ ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata)
static int
-ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata)
+ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BT_STATUS_CMD cmd;
@@ -1014,7 +1014,7 @@ ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata)
}
static int
-ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata)
+ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BT_PARAMS_CMD cmd;
@@ -1039,7 +1039,7 @@ ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata)
}
static int
-ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char * userdata)
+ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_FE_ANT_CMD cmd;
@@ -1063,7 +1063,7 @@ ar6000_xioctl_set_btcoex_fe_ant_cmd(struct net_device * dev, char * userdata)
}
static int
-ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char * userdata)
+ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_COLOCATED_BT_DEV_CMD cmd;
@@ -1088,7 +1088,7 @@ ar6000_xioctl_set_btcoex_colocated_bt_dev_cmd(struct net_device * dev, char * us
}
static int
-ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, char * userdata)
+ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_BTINQUIRY_PAGE_CONFIG_CMD cmd;
@@ -1113,7 +1113,7 @@ ar6000_xioctl_set_btcoex_btinquiry_page_config_cmd(struct net_device * dev, cha
}
static int
-ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char * userdata)
+ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_SCO_CONFIG_CMD cmd;
@@ -1139,7 +1139,7 @@ ar6000_xioctl_set_btcoex_sco_config_cmd(struct net_device * dev, char * userdata
static int
ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
- char * userdata)
+ char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_A2DP_CONFIG_CMD cmd;
@@ -1164,7 +1164,7 @@ ar6000_xioctl_set_btcoex_a2dp_config_cmd(struct net_device * dev,
}
static int
-ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char * userdata)
+ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_ACLCOEX_CONFIG_CMD cmd;
@@ -1189,7 +1189,7 @@ ar6000_xioctl_set_btcoex_aclcoex_config_cmd(struct net_device * dev, char * user
}
static int
-ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char * userdata)
+ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_DEBUG_CMD cmd;
@@ -1214,7 +1214,7 @@ ar60000_xioctl_set_btcoex_debug_cmd(struct net_device * dev, char * userdata)
}
static int
-ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char * userdata)
+ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char *userdata)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMD cmd;
@@ -1238,7 +1238,7 @@ ar6000_xioctl_set_btcoex_bt_operating_status_cmd(struct net_device * dev, char *
}
static int
-ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char * userdata,
+ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char *userdata,
struct ifreq *rq)
{
@@ -1283,7 +1283,7 @@ ar6000_xioctl_get_btcoex_config_cmd(struct net_device * dev, char * userdata,
}
static int
-ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char * userdata, struct ifreq *rq)
+ar6000_xioctl_get_btcoex_stats_cmd(struct net_device * dev, char *userdata, struct ifreq *rq)
{
AR_SOFTC_T *ar = (AR_SOFTC_T *)ar6k_priv(dev);
AR6000_BTCOEX_STATS btcoexStats;
diff --git a/drivers/staging/ath6kl/os/linux/wireless_ext.c b/drivers/staging/ath6kl/os/linux/wireless_ext.c
index eb96469..e167c82 100644
--- a/drivers/staging/ath6kl/os/linux/wireless_ext.c
+++ b/drivers/staging/ath6kl/os/linux/wireless_ext.c
@@ -94,10 +94,10 @@ ar6000_scan_node(void *arg, bss_t *ni)
char buf[256];
#endif
struct ar_giwscan_param *param;
- A_CHAR *current_ev;
- A_CHAR *end_buf;
+ char *current_ev;
+ char *end_buf;
struct ieee80211_common_ie *cie;
- A_CHAR *current_val;
+ char *current_val;
A_INT32 j;
A_UINT32 rate_len, data_len = 0;
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index 2b65c08..695b0dc 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -5215,7 +5215,7 @@ wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval)
}
int
-wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, A_CHAR* buffer)
+wmi_set_params_cmd(struct wmi_t *wmip, A_UINT32 opcode, A_UINT32 length, char *buffer)
{
void *osbuf;
WMI_SET_PARAMS_CMD *cmd;
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
