From 010dd6fba522efba103bb0060cb20b691952be8c Mon Sep 17 00:00:00 2001 From: David Lin Date: Wed, 3 Jun 2015 19:29:25 +0800 Subject: Modify code to pass checkpatch.pl. Signed-off-by: David Lin --- mwl_debug.c | 54 ++++++++++----------- mwl_debug.h | 91 +++++++++++++++++----------------- mwl_dev.h | 46 +++++++++--------- mwl_fwcmd.c | 151 +++++++++++++++++++++------------------------------------ mwl_fwcmd.h | 8 +-- mwl_fwdl.c | 5 +- mwl_fwdl.h | 5 +- mwl_mac80211.c | 39 ++++++--------- mwl_mac80211.h | 5 +- mwl_main.c | 55 +++++++++------------ mwl_rx.c | 37 ++++++-------- mwl_rx.h | 5 +- mwl_sysadpt.h | 5 +- mwl_tx.c | 67 ++++++++++++------------- mwl_tx.h | 5 +- 15 files changed, 241 insertions(+), 337 deletions(-) diff --git a/mwl_debug.c b/mwl_debug.c index 22d5acf..1ac270c 100644 --- a/mwl_debug.c +++ b/mwl_debug.c @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file implements debug related functions. -* +/* Description: This file implements debug related functions. */ #include @@ -56,7 +53,6 @@ void mwl_debug_prt(u32 classlevel, const char *func, const char *format, ...) va_list a_start; if (classlevel != 0) { - if ((class & WLDBG_CLASSES) != class) return; @@ -69,10 +65,10 @@ void mwl_debug_prt(u32 classlevel, const char *func, const char *format, ...) debug_string = kmalloc(1024, GFP_ATOMIC); - if (debug_string == NULL) + if (!debug_string) return; - if (format != NULL) { + if (format) { va_start(a_start, format); vsprintf(debug_string, format, a_start); va_end(a_start); @@ -101,8 +97,8 @@ void mwl_debug_prt(u32 classlevel, const char *func, const char *format, ...) } if (strlen(debug_string) > 0) { - if (debug_string[strlen(debug_string)-1] == '\n') - debug_string[strlen(debug_string)-1] = '\0'; + if (debug_string[strlen(debug_string) - 1] == '\n') + debug_string[strlen(debug_string) - 1] = '\0'; pr_debug("%s(): %s\n", func, debug_string); } @@ -130,10 +126,10 @@ void mwl_debug_prtdata(u32 classlevel, const char *func, dbg_string = kmalloc(len + 1024, GFP_ATOMIC); - if (dbg_string == NULL) + if (!dbg_string) return; - if (format != NULL) { + if (format) { va_start(a_start, format); vsprintf(dbg_string, format, a_start); va_end(a_start); @@ -143,7 +139,7 @@ void mwl_debug_prtdata(u32 classlevel, const char *func, if (strlen(dbg_string) > 0) { if (dbg_string[strlen(dbg_string) - 1] == '\n') - dbg_string[strlen(dbg_string)-1] = '\0'; + dbg_string[strlen(dbg_string) - 1] = '\0'; pr_debug("%s() %s\n", func, dbg_string); } else { pr_debug("%s()\n", func); @@ -152,14 +148,14 @@ void mwl_debug_prtdata(u32 classlevel, const char *func, for (curr_byte = 0; curr_byte < len; curr_byte = curr_byte + 8) { if ((curr_byte + 8) < len) { pr_debug(PRT_8BYTES, - *(memptr + curr_byte + 0), - *(memptr + curr_byte + 1), - *(memptr + curr_byte + 2), - *(memptr + curr_byte + 3), - *(memptr + curr_byte + 4), - *(memptr + curr_byte + 5), - *(memptr + curr_byte + 6), - *(memptr + curr_byte + 7)); + *(memptr + curr_byte + 0), + *(memptr + curr_byte + 1), + *(memptr + curr_byte + 2), + *(memptr + curr_byte + 3), + *(memptr + curr_byte + 4), + *(memptr + curr_byte + 5), + *(memptr + curr_byte + 6), + *(memptr + curr_byte + 7)); } else { num_bytes = len - curr_byte; offset = curr_byte; @@ -189,21 +185,21 @@ void mwl_debug_dumpdata(const void *data, int len, char *marker) for (curr_byte = 0; curr_byte < len; curr_byte = curr_byte + 8) { if ((curr_byte + 8) < len) { pr_debug(PRT_8BYTES, - *(memptr + curr_byte + 0), - *(memptr + curr_byte + 1), - *(memptr + curr_byte + 2), - *(memptr + curr_byte + 3), - *(memptr + curr_byte + 4), - *(memptr + curr_byte + 5), - *(memptr + curr_byte + 6), - *(memptr + curr_byte + 7)); + *(memptr + curr_byte + 0), + *(memptr + curr_byte + 1), + *(memptr + curr_byte + 2), + *(memptr + curr_byte + 3), + *(memptr + curr_byte + 4), + *(memptr + curr_byte + 5), + *(memptr + curr_byte + 6), + *(memptr + curr_byte + 7)); } else { num_bytes = len - curr_byte; offset = curr_byte; for (curr_byte = 0; curr_byte < num_bytes; curr_byte++) pr_debug("0x%02x ", - *(memptr + offset + curr_byte)); + *(memptr + offset + curr_byte)); pr_debug("\n\n"); break; } diff --git a/mwl_debug.h b/mwl_debug.h index 53d04b4..226db7b 100644 --- a/mwl_debug.h +++ b/mwl_debug.h @@ -14,53 +14,51 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines debug related functions. -* +/* Description: This file defines debug related functions. */ #ifndef _mwl_debug_h_ #define _mwl_debug_h_ #include +#include /* CONSTANTS AND MACROS */ -#define DBG_LEVEL_0 (1<<0) /* mwl_main.c */ -#define DBG_LEVEL_1 (1<<1) /* mwl_fwdl.c */ -#define DBG_LEVEL_2 (1<<2) /* mwl_fwcmd.c */ -#define DBG_LEVEL_3 (1<<3) /* mwl_tx.c */ -#define DBG_LEVEL_4 (1<<4) /* mwl_rx.c */ -#define DBG_LEVEL_5 (1<<5) /* mwl_mac80211.c */ -#define DBG_LEVEL_6 (1<<6) -#define DBG_LEVEL_7 (1<<7) -#define DBG_LEVEL_8 (1<<8) -#define DBG_LEVEL_9 (1<<9) -#define DBG_LEVEL_10 (1<<10) -#define DBG_LEVEL_11 (1<<11) -#define DBG_LEVEL_12 (1<<12) -#define DBG_LEVEL_13 (1<<13) -#define DBG_LEVEL_14 (1<<14) -#define DBG_LEVEL_15 (1<<15) - -#define DBG_CLASS_PANIC (1<<16) -#define DBG_CLASS_ERROR (1<<17) -#define DBG_CLASS_WARNING (1<<18) -#define DBG_CLASS_ENTER (1<<19) -#define DBG_CLASS_EXIT (1<<20) -#define DBG_CLASS_INFO (1<<21) -#define DBG_CLASS_DATA (1<<22) -#define DBG_CLASS_7 (1<<23) -#define DBG_CLASS_8 (1<<24) -#define DBG_CLASS_9 (1<<25) -#define DBG_CLASS_10 (1<<26) -#define DBG_CLASS_11 (1<<27) -#define DBG_CLASS_12 (1<<28) -#define DBG_CLASS_13 (1<<29) -#define DBG_CLASS_14 (1<<30) -#define DBG_CLASS_15 (1<<31) +#define DBG_LEVEL_0 BIT(0) /* mwl_main.c */ +#define DBG_LEVEL_1 BIT(1) /* mwl_fwdl.c */ +#define DBG_LEVEL_2 BIT(2) /* mwl_fwcmd.c */ +#define DBG_LEVEL_3 BIT(3) /* mwl_tx.c */ +#define DBG_LEVEL_4 BIT(4) /* mwl_rx.c */ +#define DBG_LEVEL_5 BIT(5) /* mwl_mac80211.c */ +#define DBG_LEVEL_6 BIT(6) +#define DBG_LEVEL_7 BIT(7) +#define DBG_LEVEL_8 BIT(8) +#define DBG_LEVEL_9 BIT(9) +#define DBG_LEVEL_10 BIT(10) +#define DBG_LEVEL_11 BIT(11) +#define DBG_LEVEL_12 BIT(12) +#define DBG_LEVEL_13 BIT(13) +#define DBG_LEVEL_14 BIT(14) +#define DBG_LEVEL_15 BIT(15) + +#define DBG_CLASS_PANIC BIT(16) +#define DBG_CLASS_ERROR BIT(17) +#define DBG_CLASS_WARNING BIT(18) +#define DBG_CLASS_ENTER BIT(19) +#define DBG_CLASS_EXIT BIT(20) +#define DBG_CLASS_INFO BIT(21) +#define DBG_CLASS_DATA BIT(22) +#define DBG_CLASS_7 BIT(23) +#define DBG_CLASS_8 BIT(24) +#define DBG_CLASS_9 BIT(25) +#define DBG_CLASS_10 BIT(26) +#define DBG_CLASS_11 BIT(27) +#define DBG_CLASS_12 BIT(28) +#define DBG_CLASS_13 BIT(29) +#define DBG_CLASS_14 BIT(30) +#define DBG_CLASS_15 BIT(31) #define WLDBG_PRINT(...) \ mwl_debug_prt(0, __func__, __VA_ARGS__) @@ -68,31 +66,32 @@ #ifdef MWL_DEBUG #define WLDBG_DUMP_DATA(classlevel, data, len) \ - mwl_debug_prtdata(classlevel|DBG_CLASS_DATA, __func__, data, len, NULL) + mwl_debug_prtdata(classlevel | DBG_CLASS_DATA, \ + __func__, data, len, NULL) #define WLDBG_ENTER(classlevel) \ - mwl_debug_prt(classlevel|DBG_CLASS_ENTER, __func__, NULL) + mwl_debug_prt(classlevel | DBG_CLASS_ENTER, __func__, NULL) #define WLDBG_ENTER_INFO(classlevel, ...) \ - mwl_debug_prt(classlevel|DBG_CLASS_ENTER, __func__, __VA_ARGS__) + mwl_debug_prt(classlevel | DBG_CLASS_ENTER, __func__, __VA_ARGS__) #define WLDBG_EXIT(classlevel) \ - mwl_debug_prt(classlevel|DBG_CLASS_EXIT, __func__, NULL) + mwl_debug_prt(classlevel | DBG_CLASS_EXIT, __func__, NULL) #define WLDBG_EXIT_INFO(classlevel, ...) \ - mwl_debug_prt(classlevel|DBG_CLASS_EXIT, __func__, __VA_ARGS__) + mwl_debug_prt(classlevel | DBG_CLASS_EXIT, __func__, __VA_ARGS__) #define WLDBG_INFO(classlevel, ...) \ - mwl_debug_prt(classlevel|DBG_CLASS_INFO, __func__, __VA_ARGS__) + mwl_debug_prt(classlevel | DBG_CLASS_INFO, __func__, __VA_ARGS__) #define WLDBG_WARNING(classlevel, ...) \ - mwl_debug_prt(classlevel|DBG_CLASS_WARNING, __func__, __VA_ARGS__) + mwl_debug_prt(classlevel | DBG_CLASS_WARNING, __func__, __VA_ARGS__) #define WLDBG_ERROR(classlevel, ...) \ - mwl_debug_prt(classlevel|DBG_CLASS_ERROR, __func__, __VA_ARGS__) + mwl_debug_prt(classlevel | DBG_CLASS_ERROR, __func__, __VA_ARGS__) #define WLDBG_PANIC(classlevel, ...) \ - mwl_debug_prt(classlevel|DBG_CLASS_PANIC, __func__, __VA_ARGS__) + mwl_debug_prt(classlevel | DBG_CLASS_PANIC, __func__, __VA_ARGS__) #else diff --git a/mwl_dev.h b/mwl_dev.h index 8895fa9..7c6facc 100644 --- a/mwl_dev.h +++ b/mwl_dev.h @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines device related information. -* +/* Description: This file defines device related information. */ #ifndef _mwl_dev_h_ @@ -27,6 +24,7 @@ #include #include #include +#include #include /* CONSTANTS AND MACROS @@ -65,26 +63,26 @@ #define MACREG_A2HRIC_BIT_RADAR_DETECT 0x00000080 /* bit 7 */ #define MACREG_A2HRIC_BIT_ICV_ERROR 0x00000100 /* bit 8 */ #define MACREG_A2HRIC_BIT_WEAKIV_ERROR 0x00000200 /* bit 9 */ -#define MACREG_A2HRIC_BIT_QUEUE_EMPTY (1<<10) -#define MACREG_A2HRIC_BIT_QUEUE_FULL (1<<11) -#define MACREG_A2HRIC_BIT_CHAN_SWITCH (1<<12) /* IEEE80211_DH */ -#define MACREG_A2HRIC_BIT_TX_WATCHDOG (1<<13) -#define MACREG_A2HRIC_BA_WATCHDOG (1<<14) -#define MACREG_A2HRIC_BIT_SSU_DONE (1<<16) -#define MACREG_A2HRIC_CONSEC_TXFAIL (1<<17) /* 15 taken by ISR_TXACK */ - -#define ISR_SRC_BITS ((MACREG_A2HRIC_BIT_RX_RDY) | \ - (MACREG_A2HRIC_BIT_TX_DONE) | \ +#define MACREG_A2HRIC_BIT_QUEUE_EMPTY BIT(10) +#define MACREG_A2HRIC_BIT_QUEUE_FULL BIT(11) +#define MACREG_A2HRIC_BIT_CHAN_SWITCH BIT(12) /* IEEE80211_DH */ +#define MACREG_A2HRIC_BIT_TX_WATCHDOG BIT(13) +#define MACREG_A2HRIC_BA_WATCHDOG BIT(14) +#define MACREG_A2HRIC_BIT_SSU_DONE BIT(16) +#define MACREG_A2HRIC_CONSEC_TXFAIL BIT(17) /* 15 taken by ISR_TXACK */ + +#define ISR_SRC_BITS ((MACREG_A2HRIC_BIT_RX_RDY) | \ + (MACREG_A2HRIC_BIT_TX_DONE) | \ (MACREG_A2HRIC_BIT_OPC_DONE) | \ - (MACREG_A2HRIC_BIT_MAC_EVENT)| \ - (MACREG_A2HRIC_BIT_WEAKIV_ERROR)| \ - (MACREG_A2HRIC_BIT_ICV_ERROR)| \ + (MACREG_A2HRIC_BIT_MAC_EVENT) | \ + (MACREG_A2HRIC_BIT_WEAKIV_ERROR) | \ + (MACREG_A2HRIC_BIT_ICV_ERROR) | \ (MACREG_A2HRIC_BIT_SSU_DONE) | \ - (MACREG_A2HRIC_BIT_RADAR_DETECT)| \ - (MACREG_A2HRIC_BIT_CHAN_SWITCH)| \ - (MACREG_A2HRIC_BIT_TX_WATCHDOG)| \ - (MACREG_A2HRIC_BIT_QUEUE_EMPTY)| \ - (MACREG_A2HRIC_BA_WATCHDOG) | \ + (MACREG_A2HRIC_BIT_RADAR_DETECT) | \ + (MACREG_A2HRIC_BIT_CHAN_SWITCH) | \ + (MACREG_A2HRIC_BIT_TX_WATCHDOG) | \ + (MACREG_A2HRIC_BIT_QUEUE_EMPTY) | \ + (MACREG_A2HRIC_BA_WATCHDOG) | \ (MACREG_A2HRIC_CONSEC_TXFAIL)) #define MACREG_A2HRIC_BIT_MASK ISR_SRC_BITS @@ -95,8 +93,8 @@ #define MACREG_H2ARIC_BIT_DOOR_BELL 0x00000002 /* bit 1 */ #define MACREG_H2ARIC_BIT_PS 0x00000004 /* bit 2 */ #define MACREG_H2ARIC_BIT_PSPOLL 0x00000008 /* bit 3 */ -#define ISR_RESET (1<<15) -#define ISR_RESET_AP33 (1<<26) +#define ISR_RESET BIT(15) +#define ISR_RESET_AP33 BIT(26) /* Data descriptor related constants */ diff --git a/mwl_fwcmd.c b/mwl_fwcmd.c index 9847f20..e5ddb44 100644 --- a/mwl_fwcmd.c +++ b/mwl_fwcmd.c @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file implements frimware host command related functions. -* +/* Description: This file implements frimware host command related functions. */ #include @@ -32,8 +29,7 @@ #define MAX_WAIT_FW_COMPLETE_ITERATIONS 10000 -/* - * 16 bit host command code +/* 16 bit host command code */ #define HOSTCMD_CMD_GET_HW_SPEC 0x0003 #define HOSTCMD_CMD_SET_HW_SPEC 0x0004 @@ -64,8 +60,7 @@ #define HOSTCMD_CMD_FW_FLUSH_TIMER 0x1148 #define HOSTCMD_CMD_SET_CDD 0x1150 -/* - * Define general result code for each command +/* Define general result code for each command */ #define HOSTCMD_RESULT_OK 0x0000 /* OK */ /* Genenral error */ @@ -79,18 +74,17 @@ /* Data buffer is not big enough */ #define HOSTCMD_RESULT_PARTIAL_DATA 0x0005 -/* - * Define channel related constants +/* Define channel related constants */ #define FREQ_BAND_2DOT4GHZ 0x1 #define FREQ_BAND_4DOT9GHZ 0x2 #define FREQ_BAND_5GHZ 0x4 #define FREQ_BAND_5DOT2GHZ 0x8 #define CH_AUTO_WIDTH 0 -#define CH_10_MHz_WIDTH 0x1 -#define CH_20_MHz_WIDTH 0x2 -#define CH_40_MHz_WIDTH 0x4 -#define CH_80_MHz_WIDTH 0x5 +#define CH_10_MHZ_WIDTH 0x1 +#define CH_20_MHZ_WIDTH 0x2 +#define CH_40_MHZ_WIDTH 0x4 +#define CH_80_MHZ_WIDTH 0x5 #define EXT_CH_ABOVE_CTRL_CH 0x1 #define EXT_CH_AUTO 0x2 #define EXT_CH_BELOW_CTRL_CH 0x3 @@ -113,19 +107,16 @@ /* active primary 8th 20MHz channel */ #define ACT_PRIMARY_CHAN_7 7 -/* - * Define rate related constants +/* Define rate related constants */ #define HOSTCMD_ACT_NOT_USE_FIXED_RATE 0x0002 -/* - * Define station related constants +/* Define station related constants */ #define HOSTCMD_ACT_STA_ACTION_ADD 0 #define HOSTCMD_ACT_STA_ACTION_REMOVE 2 -/* - * Define key related constants +/* Define key related constants */ #define MAX_ENCR_KEY_LENGTH 16 #define MIC_KEY_LENGTH 8 @@ -148,14 +139,12 @@ /* Tx/Rx MIC keys are valid */ #define ENCR_KEY_FLAG_MICKEY_VALID 0x02000000 -/* - * Define block ack related constants +/* Define block ack related constants */ #define BASTREAM_FLAG_IMMEDIATE_TYPE 1 #define BASTREAM_FLAG_DIRECTION_UPSTREAM 0 -/* - * Define general purpose action +/* Define general purpose action */ #define HOSTCMD_ACT_GEN_SET 0x0001 #define HOSTCMD_ACT_GEN_SET_LIST 0x0002 @@ -215,8 +204,7 @@ enum mac_type { WL_MAC_TYPE_SECONDARY_AP, }; -/* - * General host command header +/* General host command header */ struct hostcmd_header { @@ -227,8 +215,7 @@ struct hostcmd_header { u16 result; } __packed; -/* - * HOSTCMD_CMD_GET_HW_SPEC +/* HOSTCMD_CMD_GET_HW_SPEC */ struct hostcmd_cmd_get_hw_spec { @@ -248,8 +235,7 @@ struct hostcmd_cmd_get_hw_spec { u32 wcb_base[SYSADPT_TOTAL_TX_QUEUES - 1]; } __packed; -/* - * HOSTCMD_CMD_SET_HW_SPEC +/* HOSTCMD_CMD_SET_HW_SPEC */ struct hostcmd_cmd_set_hw_spec { @@ -300,8 +286,7 @@ struct hostcmd_cmd_set_hw_spec { u32 total_rx_wcb; } __packed; -/* - * HOSTCMD_CMD_802_11_GET_STAT +/* HOSTCMD_CMD_802_11_GET_STAT */ struct hostcmd_cmd_802_11_get_stat { @@ -342,8 +327,7 @@ struct hostcmd_cmd_802_11_get_stat { u32 tx_cts_count; } __packed; -/* - * HOSTCMD_CMD_802_11_RADIO_CONTROL +/* HOSTCMD_CMD_802_11_RADIO_CONTROL */ struct hostcmd_cmd_802_11_radio_control { @@ -354,8 +338,7 @@ struct hostcmd_cmd_802_11_radio_control { u16 radio_on; } __packed; -/* - * HOSTCMD_CMD_802_11_TX_POWER +/* HOSTCMD_CMD_802_11_TX_POWER */ struct hostcmd_cmd_802_11_tx_power { @@ -368,8 +351,7 @@ struct hostcmd_cmd_802_11_tx_power { u16 power_level_list[SYSADPT_TX_POWER_LEVEL_TOTAL]; } __packed; -/* - * HOSTCMD_CMD_802_11_RF_ANTENNA +/* HOSTCMD_CMD_802_11_RF_ANTENNA */ struct hostcmd_cmd_802_11_rf_antenna { @@ -378,8 +360,7 @@ struct hostcmd_cmd_802_11_rf_antenna { u16 antenna_mode; /* Number of antennas or 0xffff(diversity) */ } __packed; -/* - * HOSTCMD_CMD_BROADCAST_SSID_ENABLE +/* HOSTCMD_CMD_BROADCAST_SSID_ENABLE */ struct hostcmd_cmd_broadcast_ssid_enable { @@ -387,8 +368,7 @@ struct hostcmd_cmd_broadcast_ssid_enable { u32 enable; } __packed; -/* - * HOSTCMD_CMD_SET_RF_CHANNEL +/* HOSTCMD_CMD_SET_RF_CHANNEL */ struct chnl_flags_11ac { @@ -410,8 +390,7 @@ struct hostcmd_cmd_set_rf_channel { struct chnl_flags_11ac chnl_flags; } __packed; -/* - * HOSTCMD_CMD_SET_AID +/* HOSTCMD_CMD_SET_AID */ struct hostcmd_cmd_set_aid { @@ -422,16 +401,14 @@ struct hostcmd_cmd_set_aid { u8 ap_rates[SYSADPT_MAX_DATA_RATES_G]; } __packed; -/* - * HOSTCMD_CMD_SET_INFRA_MODE +/* HOSTCMD_CMD_SET_INFRA_MODE */ struct hostcmd_cmd_set_infra_mode { struct hostcmd_header cmd_hdr; } __packed; -/* - * HOSTCMD_CMD_802_11_RTS_THSD +/* HOSTCMD_CMD_802_11_RTS_THSD */ struct hostcmd_cmd_802_11_rts_thsd { @@ -440,8 +417,7 @@ struct hostcmd_cmd_802_11_rts_thsd { u16 threshold; } __packed; -/* - * HOSTCMD_CMD_SET_EDCA_PARAMS +/* HOSTCMD_CMD_SET_EDCA_PARAMS */ struct hostcmd_cmd_set_edca_params { @@ -455,8 +431,7 @@ struct hostcmd_cmd_set_edca_params { u8 txq_num; /* Tx Queue number. */ } __packed; -/* - * HOSTCMD_CMD_SET_WMM_MODE +/* HOSTCMD_CMD_SET_WMM_MODE */ struct hostcmd_cmd_set_wmm_mode { @@ -464,8 +439,7 @@ struct hostcmd_cmd_set_wmm_mode { u16 action; /* 0->unset, 1->set */ } __packed; -/* - * HOSTCMD_CMD_SET_FIXED_RATE +/* HOSTCMD_CMD_SET_FIXED_RATE */ struct fix_rate_flag { /* lower rate after the retry count */ @@ -497,8 +471,7 @@ struct hostcmd_cmd_set_fixed_rate { u8 management_rate; } __packed; -/* - * HOSTCMD_CMD_SET_IES +/* HOSTCMD_CMD_SET_IES */ struct hostcmd_cmd_set_ies { @@ -513,8 +486,7 @@ struct hostcmd_cmd_set_ies { u8 ie_list_proprietary[112]; } __packed; -/* - * HOSTCMD_CMD_SET_RATE_ADAPT_MODE +/* HOSTCMD_CMD_SET_RATE_ADAPT_MODE */ struct hostcmd_cmd_set_rate_adapt_mode { @@ -523,8 +495,7 @@ struct hostcmd_cmd_set_rate_adapt_mode { u16 rate_adapt_mode; /* 0:Indoor, 1:Outdoor */ } __packed; -/* - * HOSTCMD_CMD_SET_MAC_ADDR, HOSTCMD_CMD_DEL_MAC_ADDR +/* HOSTCMD_CMD_SET_MAC_ADDR, HOSTCMD_CMD_DEL_MAC_ADDR */ struct hostcmd_cmd_set_mac_addr { @@ -533,8 +504,7 @@ struct hostcmd_cmd_set_mac_addr { u8 mac_addr[ETH_ALEN]; } __packed; -/* - * HOSTCMD_CMD_GET_WATCHDOG_BITMAP +/* HOSTCMD_CMD_GET_WATCHDOG_BITMAP */ struct hostcmd_cmd_get_watchdog_bitmap { @@ -542,8 +512,7 @@ struct hostcmd_cmd_get_watchdog_bitmap { u8 watchdog_bitmap; /* for SW/BA */ } __packed; -/* - * HOSTCMD_CMD_BSS_START +/* HOSTCMD_CMD_BSS_START */ struct hostcmd_cmd_bss_start { @@ -551,8 +520,7 @@ struct hostcmd_cmd_bss_start { u32 enable; /* FALSE: Disable or TRUE: Enable */ } __packed; -/* - * HOSTCMD_CMD_AP_BEACON +/* HOSTCMD_CMD_AP_BEACON */ struct cf_params { @@ -691,8 +659,7 @@ struct hostcmd_cmd_ap_beacon { struct start_cmd start_cmd; } __packed; -/* - * HOSTCMD_CMD_SET_NEW_STN +/* HOSTCMD_CMD_SET_NEW_STN */ struct cap_info { @@ -776,8 +743,7 @@ struct hostcmd_cmd_set_new_stn { u32 fw_sta_ptr; } __packed; -/* - * HOSTCMD_CMD_SET_APMODE +/* HOSTCMD_CMD_SET_APMODE */ struct hostcmd_cmd_set_apmode { @@ -785,8 +751,7 @@ struct hostcmd_cmd_set_apmode { u8 apmode; } __packed; -/* - * HOSTCMD_CMD_UPDATE_ENCRYPTION +/* HOSTCMD_CMD_UPDATE_ENCRYPTION */ struct hostcmd_cmd_update_encryptoin { @@ -860,8 +825,7 @@ struct hostcmd_cmd_set_key { struct key_param_set key_param; } __packed; -/* - * HOSTCMD_CMD_BASTREAM +/* HOSTCMD_CMD_BASTREAM */ struct ba_stream_flags { @@ -940,8 +904,7 @@ struct hostcmd_cmd_bastream { union ba_info ba_info; } __packed; -/* - * HOSTCMD_CMD_DWDS_ENABLE +/* HOSTCMD_CMD_DWDS_ENABLE */ struct hostcmd_cmd_dwds_enable { @@ -949,8 +912,7 @@ struct hostcmd_cmd_dwds_enable { u32 enable; /* 0 -- Disable. or 1 -- Enable. */ } __packed; -/* - * HOSTCMD_CMD_FW_FLUSH_TIMER +/* HOSTCMD_CMD_FW_FLUSH_TIMER */ struct hostcmd_cmd_fw_flush_timer { @@ -959,8 +921,7 @@ struct hostcmd_cmd_fw_flush_timer { u32 value; } __packed; -/* - * HOSTCMD_CMD_SET_CDD +/* HOSTCMD_CMD_SET_CDD */ struct hostcmd_cmd_set_cdd { @@ -1321,17 +1282,17 @@ int mwl_fwcmd_max_tx_power(struct ieee80211_hw *hw, if ((conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT) || (conf->chandef.width == NL80211_CHAN_WIDTH_20)) { - width = CH_20_MHz_WIDTH; + width = CH_20_MHZ_WIDTH; sub_ch = NO_EXT_CHANNEL; } else if (conf->chandef.width == NL80211_CHAN_WIDTH_40) { - width = CH_40_MHz_WIDTH; + width = CH_40_MHZ_WIDTH; if (conf->chandef.center_freq1 > channel->center_freq) sub_ch = EXT_CH_ABOVE_CTRL_CH; else sub_ch = EXT_CH_BELOW_CTRL_CH; } else if (conf->chandef.width == NL80211_CHAN_WIDTH_80) { - width = CH_80_MHz_WIDTH; + width = CH_80_MHZ_WIDTH; if (conf->chandef.center_freq1 > channel->center_freq) sub_ch = EXT_CH_ABOVE_CTRL_CH; else @@ -1410,16 +1371,16 @@ int mwl_fwcmd_tx_power(struct ieee80211_hw *hw, if ((conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT) || (conf->chandef.width == NL80211_CHAN_WIDTH_20)) { - width = CH_20_MHz_WIDTH; + width = CH_20_MHZ_WIDTH; sub_ch = NO_EXT_CHANNEL; } else if (conf->chandef.width == NL80211_CHAN_WIDTH_40) { - width = CH_40_MHz_WIDTH; + width = CH_40_MHZ_WIDTH; if (conf->chandef.center_freq1 > channel->center_freq) sub_ch = EXT_CH_ABOVE_CTRL_CH; else sub_ch = EXT_CH_BELOW_CTRL_CH; } else if (conf->chandef.width == NL80211_CHAN_WIDTH_80) { - width = CH_80_MHz_WIDTH; + width = CH_80_MHZ_WIDTH; if (conf->chandef.center_freq1 > channel->center_freq) sub_ch = EXT_CH_ABOVE_CTRL_CH; else @@ -1624,16 +1585,16 @@ int mwl_fwcmd_set_rf_channel(struct ieee80211_hw *hw, if ((conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT) || (conf->chandef.width == NL80211_CHAN_WIDTH_20)) { - pcmd->chnl_flags.chnl_width = CH_20_MHz_WIDTH; + pcmd->chnl_flags.chnl_width = CH_20_MHZ_WIDTH; pcmd->chnl_flags.act_primary = ACT_PRIMARY_CHAN_0; } else if (conf->chandef.width == NL80211_CHAN_WIDTH_40) { - pcmd->chnl_flags.chnl_width = CH_40_MHz_WIDTH; + pcmd->chnl_flags.chnl_width = CH_40_MHZ_WIDTH; if (conf->chandef.center_freq1 > channel->center_freq) pcmd->chnl_flags.act_primary = ACT_PRIMARY_CHAN_0; else pcmd->chnl_flags.act_primary = ACT_PRIMARY_CHAN_1; } else if (conf->chandef.width == NL80211_CHAN_WIDTH_80) { - pcmd->chnl_flags.chnl_width = CH_80_MHz_WIDTH; + pcmd->chnl_flags.chnl_width = CH_80_MHZ_WIDTH; pcmd->chnl_flags.act_primary = mwl_fwcmd_get_80m_pri_chnl_offset(pcmd->curr_chnl); } @@ -2165,7 +2126,7 @@ int mwl_fwcmd_set_new_stn_add(struct ieee80211_hw *hw, pcmd->cmd_hdr.macid = mwl_vif->macid; pcmd->action = ENDIAN_SWAP16(HOSTCMD_ACT_STA_ACTION_ADD); - if (mwl_vif->is_sta == true) { + if (mwl_vif->is_sta) { pcmd->aid = 0; pcmd->stn_id = 0; } else { @@ -2208,7 +2169,7 @@ int mwl_fwcmd_set_new_stn_add(struct ieee80211_hw *hw, return -EIO; } - if (mwl_vif->is_sta == true) { + if (mwl_vif->is_sta) { ether_addr_copy(pcmd->mac_addr, mwl_vif->sta_mac); if (mwl_fwcmd_exec_cmd(priv, HOSTCMD_CMD_SET_NEW_STN)) { @@ -2302,7 +2263,7 @@ int mwl_fwcmd_set_new_stn_del(struct ieee80211_hw *hw, return -EIO; } - if (mwl_vif->is_sta == true) { + if (mwl_vif->is_sta) { ether_addr_copy(pcmd->mac_addr, mwl_vif->sta_mac); if (mwl_fwcmd_exec_cmd(priv, HOSTCMD_CMD_SET_NEW_STN)) { @@ -2389,7 +2350,7 @@ int mwl_fwcmd_update_encryption_enable(struct ieee80211_hw *hw, return -EIO; } - if (mwl_vif->is_sta == true) { + if (mwl_vif->is_sta) { if (memcmp(mwl_vif->bssid, addr, ETH_ALEN) == 0) ether_addr_copy(pcmd->mac_addr, mwl_vif->sta_mac); else @@ -2487,7 +2448,7 @@ int mwl_fwcmd_encryption_set_key(struct ieee80211_hw *hw, return -EIO; } - if (mwl_vif->is_sta == true) { + if (mwl_vif->is_sta) { if (memcmp(mwl_vif->bssid, addr, ETH_ALEN) == 0) ether_addr_copy(pcmd->key_param.mac_addr, mwl_vif->sta_mac); @@ -3374,7 +3335,7 @@ static void mwl_fwcmd_parse_beacon(struct mwl_priv *priv, pos += elen; } - if (elem_parse_failed == false) { + if (!elem_parse_failed) { beacon_info->ie_ht_ptr = &beacon_info->ie_list_ht[0]; beacon_info->ie_vht_ptr = &beacon_info->ie_list_vht[0]; beacon_info->valid = true; diff --git a/mwl_fwcmd.h b/mwl_fwcmd.h index 8fe0c13..36b27eb 100644 --- a/mwl_fwcmd.h +++ b/mwl_fwcmd.h @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines firmware host command related functions. -* +/* Description: This file defines firmware host command related functions. */ #ifndef _mwl_fwcmd_h_ @@ -26,8 +23,7 @@ /* CONSTANTS AND MACROS */ -/* - * Define OpMode for SoftAP/Station mode +/* Define OpMode for SoftAP/Station mode * * The following mode signature has to be written to PCI scratch register#0 * right after successfully downloading the last block of firmware and diff --git a/mwl_fwdl.c b/mwl_fwdl.c index 6508c93..442c21c 100644 --- a/mwl_fwdl.c +++ b/mwl_fwdl.c @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file implements firmware download related functions. -* +/* Description: This file implements firmware download related functions. */ #include diff --git a/mwl_fwdl.h b/mwl_fwdl.h index 698a4d0..cad4056 100644 --- a/mwl_fwdl.h +++ b/mwl_fwdl.h @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines firmware download related functions. -* +/* Description: This file defines firmware download related functions. */ #ifndef _mwl_fwdl_h_ diff --git a/mwl_mac80211.c b/mwl_mac80211.c index 26c6286..41475d0 100644 --- a/mwl_mac80211.c +++ b/mwl_mac80211.c @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file implements mac80211 related functions. -* +/* Description: This file implements mac80211 related functions. */ #include @@ -458,8 +455,7 @@ static void mwl_mac80211_configure_filter(struct ieee80211_hw *hw, { WLDBG_ENTER(DBG_LEVEL_5); - /* - * AP firmware doesn't allow fine-grained control over + /* AP firmware doesn't allow fine-grained control over * the receive filter. */ *total_flags &= FIF_ALLMULTI | FIF_BCN_PRBRESP_PROMISC; @@ -484,11 +480,11 @@ static int mwl_mac80211_set_key(struct ieee80211_hw *hw, BUG_ON(!mwl_vif); BUG_ON(!sta_info); - if (sta == NULL) { + if (!sta) { addr = vif->addr; } else { addr = sta->addr; - if (mwl_vif->is_sta == true) + if (mwl_vif->is_sta) ether_addr_copy(mwl_vif->bssid, addr); } @@ -498,13 +494,13 @@ static int mwl_mac80211_set_key(struct ieee80211_hw *hw, if (rc) goto out; - if ((key->cipher == WLAN_CIPHER_SUITE_WEP40) - || (key->cipher == WLAN_CIPHER_SUITE_WEP104)) { + if ((key->cipher == WLAN_CIPHER_SUITE_WEP40) || + (key->cipher == WLAN_CIPHER_SUITE_WEP104)) { encr_type = ENCR_TYPE_WEP; } else if (key->cipher == WLAN_CIPHER_SUITE_CCMP) { encr_type = ENCR_TYPE_AES; if ((key->flags & IEEE80211_KEY_FLAG_PAIRWISE) == 0) { - if (mwl_vif->is_sta == false) + if (!mwl_vif->is_sta) mwl_vif->keyidx = key->keyidx; } } else if (key->cipher == WLAN_CIPHER_SUITE_TKIP) { @@ -569,7 +565,7 @@ static int mwl_mac80211_sta_add(struct ieee80211_hw *hw, if (sta->ht_cap.ht_supported) sta_info->is_ampdu_allowed = true; - if (mwl_vif->is_sta == true) + if (mwl_vif->is_sta) mwl_fwcmd_set_new_stn_del(hw, vif, sta->addr); rc = mwl_fwcmd_set_new_stn_add(hw, vif, sta); @@ -707,7 +703,7 @@ static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw, */ *ssn = 0; - if (stream == NULL) { + if (!stream) { /* This means that somebody outside this driver called * ieee80211_start_tx_ba_session. This is unexpected * because we do our own rate control. Just warn and @@ -716,7 +712,7 @@ static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw, stream = mwl_fwcmd_add_stream(hw, sta, tid); } - if (stream == NULL) { + if (!stream) { WLDBG_EXIT_INFO(DBG_LEVEL_5, "no stream found"); rc = -EBUSY; break; @@ -776,15 +772,15 @@ static int mwl_mac80211_ampdu_action(struct ieee80211_hw *hw, ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid); break; case IEEE80211_AMPDU_TX_OPERATIONAL: - BUG_ON(stream == NULL); + BUG_ON(!stream); BUG_ON(stream->state != AMPDU_STREAM_IN_PROGRESS); SPIN_UNLOCK(&priv->locks.stream_lock); rc = mwl_fwcmd_create_ba(hw, stream, buf_size, vif); SPIN_LOCK(&priv->locks.stream_lock); - if (!rc) + if (!rc) { stream->state = AMPDU_STREAM_ACTIVE; - else { + } else { idx = stream->idx; SPIN_UNLOCK(&priv->locks.stream_lock); mwl_fwcmd_destroy_ba(hw, idx); @@ -823,8 +819,7 @@ static void mwl_mac80211_bss_info_changed_sta(struct ieee80211_hw *hw, } if ((changed & BSS_CHANGED_ASSOC) && vif->bss_conf.assoc) { - - mwl_fwcmd_set_aid(hw, vif, (u8 *) vif->bss_conf.bssid, + mwl_fwcmd_set_aid(hw, vif, (u8 *)vif->bss_conf.bssid, vif->bss_conf.aid); } } @@ -843,8 +838,7 @@ static void mwl_mac80211_bss_info_changed_ap(struct ieee80211_hw *hw, int idx; int rate; - /* - * Use lowest supported basic rate for multicasts + /* Use lowest supported basic rate for multicasts * and management frames (such as probe responses -- * beacons will always go out at 1 Mb/s). */ @@ -865,8 +859,7 @@ static void mwl_mac80211_bss_info_changed_ap(struct ieee80211_hw *hw, skb = ieee80211_beacon_get(hw, vif); - if (skb != NULL) { - + if (skb) { mwl_fwcmd_set_beacon(hw, vif, skb->data, skb->len); dev_kfree_skb_any(skb); } diff --git a/mwl_mac80211.h b/mwl_mac80211.h index 1d4b57c..71fc4f8 100644 --- a/mwl_mac80211.h +++ b/mwl_mac80211.h @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines mac80211 related functions. -* +/* Description: This file defines mac80211 related functions. */ #ifndef _mwl_mac80211_h_ diff --git a/mwl_main.c b/mwl_main.c index 85cca3b..fd67660 100644 --- a/mwl_main.c +++ b/mwl_main.c @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file implements main functions of this module. -* +/* Description: This file implements main functions of this module. */ #include @@ -38,14 +35,13 @@ #define MWL_DESC "Marvell 802.11ac Wireless Network Driver" #define MWL_DEV_NAME "Marvell 88W8864 802.11ac Adapter" #define MWL_DRV_NAME KBUILD_MODNAME -#define MWL_DRV_VERSION "10.3.0.2" +#define MWL_DRV_VERSION "10.3.0.2--" #define FILE_PATH_LEN 64 #define CMD_BUF_SIZE 0x4000 #define INVALID_WATCHDOG 0xAA - /* PRIVATE FUNCTION DECLARATION */ @@ -67,7 +63,6 @@ static void mwl_wl_deinit(struct mwl_priv *priv); static void mwl_watchdog_ba_events(struct work_struct *work); static irqreturn_t mwl_interrupt(int irq, void *dev_id); - /* PRIVATE VARIABLES */ @@ -178,7 +173,6 @@ static const struct ieee80211_iface_combination ap_if_comb = { .num_different_channels = 1, }; - /* PRIVATE FUNCTION DEFINITION */ @@ -217,7 +211,7 @@ static int mwl_probe(struct pci_dev *pdev, const struct pci_device_id *id) pci_set_master(pdev); hw = ieee80211_alloc_hw(sizeof(*priv), mwl_mac80211_get_ops()); - if (hw == NULL) { + if (!hw) { WLDBG_PRINT("%s: ieee80211 alloc failed", MWL_DRV_NAME); rc = -ENOMEM; @@ -300,7 +294,7 @@ static void mwl_remove(struct pci_dev *pdev) WLDBG_ENTER(DBG_LEVEL_0); - if (hw == NULL) { + if (!hw) { WLDBG_EXIT_INFO(DBG_LEVEL_0, "ieee80211 hw is null"); return; } @@ -384,12 +378,12 @@ static int mwl_alloc_pci_resource(struct mwl_priv *priv) WLDBG_PRINT("priv->iobase1 = %x", (unsigned int)priv->iobase1); priv->pcmd_buf = - (unsigned short *) dma_alloc_coherent(&priv->pdev->dev, - CMD_BUF_SIZE, - &priv->pphys_cmd_buf, - GFP_KERNEL); + (unsigned short *)dma_alloc_coherent(&priv->pdev->dev, + CMD_BUF_SIZE, + &priv->pphys_cmd_buf, + GFP_KERNEL); - if (priv->pcmd_buf == NULL) { + if (!priv->pcmd_buf) { WLDBG_ERROR(DBG_LEVEL_0, "%s: cannot alloc memory for command buffer", MWL_DRV_NAME); @@ -429,7 +423,6 @@ err_reserve_mem_region_bar0: WLDBG_EXIT_INFO(DBG_LEVEL_0, "pci alloc fail"); return -EIO; - } static void mwl_free_pci_resource(struct mwl_priv *priv) @@ -445,10 +438,9 @@ static void mwl_free_pci_resource(struct mwl_priv *priv) iounmap(priv->iobase0); iounmap(priv->iobase1); release_mem_region(pci_resource_start(pdev, priv->next_bar_num), - pci_resource_len(pdev, - priv->next_bar_num)); + pci_resource_len(pdev, priv->next_bar_num)); release_mem_region(pci_resource_start(pdev, 0), - pci_resource_len(pdev, 0)); + pci_resource_len(pdev, 0)); dma_free_coherent(&priv->pdev->dev, CMD_BUF_SIZE, priv->pcmd_buf, priv->pphys_cmd_buf); @@ -511,12 +503,12 @@ static void mwl_reg_notifier(struct wiphy *wiphy, WLDBG_ENTER(DBG_LEVEL_0); BUG_ON(!wiphy); - hw = (struct ieee80211_hw *) wiphy_priv(wiphy); + hw = (struct ieee80211_hw *)wiphy_priv(wiphy); BUG_ON(!hw); priv = hw->priv; BUG_ON(!priv); - if (priv->pwr_node != NULL) { + if (priv->pwr_node) { for_each_property_of_node(priv->pwr_node, prop) { if (strcmp(prop->name, "FCC") == 0) fcc_prop = prop; @@ -529,7 +521,7 @@ static void mwl_reg_notifier(struct wiphy *wiphy, prop = NULL; - if (specific_prop != NULL) { + if (specific_prop) { prop = specific_prop; } else { if (request->dfs_region == NL80211_DFS_ETSI) @@ -538,7 +530,7 @@ static void mwl_reg_notifier(struct wiphy *wiphy, prop = fcc_prop; } - if (prop != NULL) { + if (prop) { /* Reset the whole table */ for (i = 0; i < SYSADPT_MAX_NUM_CHANNELS; i++) @@ -627,7 +619,7 @@ static int mwl_process_of_dts(struct mwl_priv *priv) priv->dt_node = of_find_node_by_name(pci_bus_to_OF_node(priv->pdev->bus), "mwlwifi"); - if (priv->dt_node == NULL) + if (!priv->dt_node) return -EPERM; /* look for all matching property names @@ -750,7 +742,7 @@ static void mwl_set_caps(struct mwl_priv *priv) /* set up band information for 2.4G */ - if (priv->disable_2g == false) { + if (!priv->disable_2g) { BUILD_BUG_ON(sizeof(priv->channels_24) != sizeof(mwl_channels_24)); memcpy(priv->channels_24, mwl_channels_24, @@ -773,7 +765,7 @@ static void mwl_set_caps(struct mwl_priv *priv) /* set up band information for 5G */ - if (priv->disable_5g == false) { + if (!priv->disable_5g) { BUILD_BUG_ON(sizeof(priv->channels_50) != sizeof(mwl_channels_50)); memcpy(priv->channels_50, mwl_channels_50, @@ -809,8 +801,7 @@ static int mwl_wl_init(struct mwl_priv *priv) hw = priv->hw; BUG_ON(!hw); - /* - * Extra headroom is the size of the required DMA header + /* Extra headroom is the size of the required DMA header * minus the size of the smallest 802.11 frame (CTS frame). */ hw->extra_tx_headroom = @@ -821,8 +812,7 @@ static int mwl_wl_init(struct mwl_priv *priv) */ hw->flags |= IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_HAS_RATE_CONTROL; - /* - * Ask mac80211 to not to trigger PS mode + /* Ask mac80211 to not to trigger PS mode * based on PM bit of incoming frames. */ hw->flags |= IEEE80211_HW_AP_LINK_PS; @@ -1059,7 +1049,7 @@ static irqreturn_t mwl_interrupt(int irq, void *dev_id) if (int_status & MACREG_A2HRIC_BIT_TX_DONE) { int_status &= ~MACREG_A2HRIC_BIT_TX_DONE; - if (priv->is_tx_schedule == false) { + if (!priv->is_tx_schedule) { status = readl(int_status_mask); writel((status & ~MACREG_A2HRIC_BIT_TX_DONE), int_status_mask); @@ -1071,7 +1061,7 @@ static irqreturn_t mwl_interrupt(int irq, void *dev_id) if (int_status & MACREG_A2HRIC_BIT_RX_RDY) { int_status &= ~MACREG_A2HRIC_BIT_RX_RDY; - if (priv->is_rx_schedule == false) { + if (!priv->is_rx_schedule) { status = readl(int_status_mask); writel((status & ~MACREG_A2HRIC_BIT_RX_RDY), int_status_mask); @@ -1095,7 +1085,6 @@ static irqreturn_t mwl_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } - module_pci_driver(mwl_pci_driver); MODULE_DESCRIPTION(MWL_DESC); diff --git a/mwl_rx.c b/mwl_rx.c index 5660070..7d813f3 100644 --- a/mwl_rx.c +++ b/mwl_rx.c @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file implements receive related functions. -* +/* Description: This file implements receive related functions. */ #include @@ -142,7 +139,7 @@ void mwl_rx_recv(unsigned long data) curr_desc = priv->desc_data[0].pnext_rx_desc; - if (curr_desc == NULL) { + if (!curr_desc) { status_mask = readl(priv->iobase1 + MACREG_REG_A2H_INTERRUPT_STATUS_MASK); writel(status_mask | MACREG_A2HRIC_BIT_RX_RDY, @@ -154,10 +151,10 @@ void mwl_rx_recv(unsigned long data) return; } - while ((curr_desc->rx_control == EAGLE_RXD_CTRL_DMA_OWN) - && (work_done < priv->recv_limit)) { + while ((curr_desc->rx_control == EAGLE_RXD_CTRL_DMA_OWN) && + (work_done < priv->recv_limit)) { prx_skb = curr_desc->psk_buff; - if (prx_skb == NULL) + if (!prx_skb) goto out; pci_unmap_single(priv->pdev, ENDIAN_SWAP32(curr_desc->pphys_buff_data), @@ -196,10 +193,8 @@ void mwl_rx_recv(unsigned long data) mwl_vif = mwl_rx_find_vif_bss(&priv->vif_list, wh->addr2); - if (mwl_vif != NULL && - mwl_vif->is_hw_crypto_enabled) { - /* - * When MMIC ERROR is encountered + if (mwl_vif && mwl_vif->is_hw_crypto_enabled) { + /* When MMIC ERROR is encountered * by the firmware, payload is * dropped and only 32 bytes of * mwl8k Firmware header is sent @@ -216,7 +211,7 @@ void mwl_rx_recv(unsigned long data) tr = (struct mwl_dma_data *) prx_skb->data; - memset((void *)&(tr->data), 0, 4); + memset((void *)&tr->data, 0, 4); pkt_len += 4; } @@ -268,7 +263,7 @@ static int mwl_rx_ring_alloc(struct mwl_priv *priv) &priv->desc_data[0].pphys_rx_ring, GFP_KERNEL); - if (priv->desc_data[0].prx_ring == NULL) { + if (!priv->desc_data[0].prx_ring) { WLDBG_ERROR(DBG_LEVEL_4, "can not alloc mem"); WLDBG_EXIT_INFO(DBG_LEVEL_4, "no memory"); return -ENOMEM; @@ -293,7 +288,7 @@ static int mwl_rx_ring_init(struct mwl_priv *priv) desc = &priv->desc_data[0]; - if (desc->prx_ring != NULL) { + if (desc->prx_ring) { desc->rx_buf_size = SYSADPT_MAX_AGGR_SIZE; for (curr_desc = 0; curr_desc < SYSADPT_MAX_NUM_RX_DESC; @@ -306,7 +301,7 @@ static int mwl_rx_ring_init(struct mwl_priv *priv) WLDBG_ERROR(DBG_LEVEL_4, "need linearize memory"); WLDBG_EXIT_INFO(DBG_LEVEL_4, - "no suitable memory"); + "no suitable memory"); return -ENOMEM; } @@ -318,7 +313,7 @@ static int mwl_rx_ring_init(struct mwl_priv *priv) CURR_RXD.channel = 0x00; CURR_RXD.rssi = 0x00; - if (CURR_RXD.psk_buff != NULL) { + if (CURR_RXD.psk_buff) { dma_addr_t dma; u32 val; @@ -385,10 +380,10 @@ static void mwl_rx_ring_cleanup(struct mwl_priv *priv) BUG_ON(!priv); - if (priv->desc_data[0].prx_ring != NULL) { + if (priv->desc_data[0].prx_ring) { for (curr_desc = 0; curr_desc < SYSADPT_MAX_NUM_RX_DESC; curr_desc++) { - if (CURR_RXD.psk_buff == NULL) + if (!CURR_RXD.psk_buff) continue; if (skb_shinfo(CURR_RXD.psk_buff)->nr_frags) @@ -425,7 +420,7 @@ static void mwl_rx_ring_free(struct mwl_priv *priv) BUG_ON(!priv); - if (priv->desc_data[0].prx_ring != NULL) { + if (priv->desc_data[0].prx_ring) { mwl_rx_ring_cleanup(priv); dma_free_coherent(&priv->pdev->dev, @@ -558,7 +553,7 @@ static int mwl_rx_refill(struct mwl_priv *priv, struct mwl_rx_desc *pdesc) pdesc->psk_buff = dev_alloc_skb(priv->desc_data[0].rx_buf_size); - if (pdesc->psk_buff == NULL) + if (!pdesc->psk_buff) goto nomem; if (skb_linearize(pdesc->psk_buff)) { diff --git a/mwl_rx.h b/mwl_rx.h index 9922134..184ff31 100644 --- a/mwl_rx.h +++ b/mwl_rx.h @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines receive related functions. -* +/* Description: This file defines receive related functions. */ #ifndef _mwl_rx_h_ diff --git a/mwl_sysadpt.h b/mwl_sysadpt.h index 222e559..1b17ec0 100644 --- a/mwl_sysadpt.h +++ b/mwl_sysadpt.h @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines system adaptation related information. -* +/* Description: This file defines system adaptation related information. */ #ifndef _mwl_sysadpt_h_ diff --git a/mwl_tx.c b/mwl_tx.c index 150d412..3bd1979 100644 --- a/mwl_tx.c +++ b/mwl_tx.c @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file implements transmit related functions. -* +/* Description: This file implements transmit related functions. */ #include @@ -229,7 +226,7 @@ void mwl_tx_xmit(struct ieee80211_hw *hw, } } else { if (ccmp) { - if (mwl_vif->is_sta == true) { + if (mwl_vif->is_sta) { mwl_tx_insert_ccmp_hdr(dma_data->data, mwl_vif->keyidx, mwl_vif->iv16, @@ -261,9 +258,9 @@ void mwl_tx_xmit(struct ieee80211_hw *hw, */ if (mgmtframe) { if (unlikely(ieee80211_is_action(wh->frame_control) && - mgmt->u.action.category == WLAN_CATEGORY_BACK && - mgmt->u.action.u.addba_req.action_code == - WLAN_ACTION_ADDBA_REQ)) { + mgmt->u.action.category == WLAN_CATEGORY_BACK && + mgmt->u.action.u.addba_req.action_code == + WLAN_ACTION_ADDBA_REQ)) { u16 capab = ENDIAN_SWAP16(mgmt->u.action.u.addba_req.capab); tid = (capab & IEEE80211_ADDBA_PARAM_TID_MASK) >> 2; @@ -281,7 +278,7 @@ void mwl_tx_xmit(struct ieee80211_hw *hw, SPIN_LOCK(&priv->locks.stream_lock); stream = mwl_fwcmd_lookup_stream(hw, sta->addr, tid); - if (stream != NULL) { + if (stream) { if (stream->state == AMPDU_STREAM_ACTIVE) { WARN_ON(!(qos & MWL_QOS_ACK_POLICY_BLOCKACK)); @@ -318,13 +315,13 @@ void mwl_tx_xmit(struct ieee80211_hw *hw, } else { /* Defer calling mwl8k_start_stream so that the current * skb can go out before the ADDBA request. This - * prevents sequence number mismatch at the recepient + * prevents sequence number mismatch at the recipient * as described above. */ if (mwl_fwcmd_ampdu_allowed(sta, tid)) { stream = mwl_fwcmd_add_stream(hw, sta, tid); - if (stream != NULL) + if (stream) start_ba_session = true; } } @@ -385,15 +382,14 @@ void mwl_tx_done(unsigned long data) SPIN_LOCK_IRQSAVE(&priv->locks.xmit_lock, flags); for (num = 0; num < SYSADPT_NUM_OF_DESC_DATA; num++) { - while (STALE_TXD(num) - && (STALE_TXD(num)->status & - ENDIAN_SWAP32(EAGLE_TXD_STATUS_OK)) - && (!(STALE_TXD(num)->status & + while (STALE_TXD(num) && (STALE_TXD(num)->status & + ENDIAN_SWAP32(EAGLE_TXD_STATUS_OK)) && + (!(STALE_TXD(num)->status & ENDIAN_SWAP32(EAGLE_TXD_STATUS_FW_OWNED)))) { pci_unmap_single(priv->pdev, - ENDIAN_SWAP32(STALE_TXD(num)->pkt_ptr), - STALE_TXD(num)->psk_buff->len, - PCI_DMA_TODEVICE); + ENDIAN_SWAP32(STALE_TXD(num)->pkt_ptr), + STALE_TXD(num)->psk_buff->len, + PCI_DMA_TODEVICE); done_skb = STALE_TXD(num)->psk_buff; rate_info = STALE_TXD(num)->rate_info; STALE_TXD(num)->pkt_len = 0; @@ -495,7 +491,7 @@ static int mwl_tx_ring_alloc(struct mwl_priv *priv) MAX_NUM_TX_RING_BYTES * SYSADPT_NUM_OF_DESC_DATA, &priv->desc_data[0].pphys_tx_ring, GFP_KERNEL); - if (mem == NULL) { + if (!mem) { WLDBG_ERROR(DBG_LEVEL_3, "can not alloc mem"); WLDBG_EXIT_INFO(DBG_LEVEL_3, "no memory"); return -ENOMEM; @@ -541,7 +537,7 @@ static int mwl_tx_ring_init(struct mwl_priv *priv) desc = &priv->desc_data[num]; - if (desc->ptx_ring != NULL) { + if (desc->ptx_ring) { WLDBG_INFO(DBG_LEVEL_3, "initializing %i descriptors", SYSADPT_MAX_NUM_TX_DESC); @@ -598,10 +594,10 @@ static void mwl_tx_ring_cleanup(struct mwl_priv *priv) for (num = 0; num < SYSADPT_NUM_OF_DESC_DATA; num++) { skb_queue_purge(&priv->txq[num]); priv->fw_desc_cnt[num] = 0; - if (priv->desc_data[num].ptx_ring != NULL) { + if (priv->desc_data[num].ptx_ring) { for (curr_desc = 0; curr_desc < SYSADPT_MAX_NUM_TX_DESC; curr_desc++) { - if (CURR_TXD(num).psk_buff == NULL) + if (!CURR_TXD(num).psk_buff) continue; WLDBG_INFO(DBG_LEVEL_3, @@ -637,15 +633,16 @@ static void mwl_tx_ring_free(struct mwl_priv *priv) BUG_ON(!priv); - if (priv->desc_data[0].ptx_ring != NULL) { + if (priv->desc_data[0].ptx_ring) { dma_free_coherent(&priv->pdev->dev, - MAX_NUM_TX_RING_BYTES * SYSADPT_NUM_OF_DESC_DATA, - priv->desc_data[0].ptx_ring, - priv->desc_data[0].pphys_tx_ring); + MAX_NUM_TX_RING_BYTES * + SYSADPT_NUM_OF_DESC_DATA, + priv->desc_data[0].ptx_ring, + priv->desc_data[0].pphys_tx_ring); } for (num = 0; num < SYSADPT_NUM_OF_DESC_DATA; num++) { - if (priv->desc_data[num].ptx_ring != NULL) + if (priv->desc_data[num].ptx_ring) priv->desc_data[num].ptx_ring = NULL; priv->desc_data[num].pstale_tx_desc = NULL; priv->desc_data[num].pnext_tx_desc = NULL; @@ -664,8 +661,7 @@ static inline void mwl_tx_add_dma_header(struct mwl_priv *priv, int reqd_hdrlen; struct mwl_dma_data *tr; - /* - * Add a firmware DMA header; the firmware requires that we + /* Add a firmware DMA header; the firmware requires that we * present a 2-byte payload length followed by a 4-address * header (without QoS field), followed (optionally) by any * WEP/ExtIV header (but only filled in for CCMP). @@ -690,8 +686,7 @@ static inline void mwl_tx_add_dma_header(struct mwl_priv *priv, if (hdrlen != sizeof(tr->wh)) memset(((void *)&tr->wh) + hdrlen, 0, sizeof(tr->wh) - hdrlen); - /* - * Firmware length is the length of the fully formed "802.11 + /* Firmware length is the length of the fully formed "802.11 * payload". That is, everything except for the 802.11 header. * This includes all crypto material including the MIC. */ @@ -716,8 +711,7 @@ static inline void mwl_tx_encapsulate_frame(struct mwl_priv *priv, if (ieee80211_is_data(wh->frame_control)) key_conf = tx_info->control.hw_key; - /* - * Make sure the packet header is in the DMA header format (4-address + /* Make sure the packet header is in the DMA header format (4-address * without QoS), and add head & tail padding when HW crypto is enabled. * * We have the following trailer padding requirements: @@ -727,7 +721,7 @@ static inline void mwl_tx_encapsulate_frame(struct mwl_priv *priv, */ data_pad = 0; - if (key_conf != NULL) { + if (key_conf) { head_pad = key_conf->iv_len; switch (key_conf->cipher) { @@ -804,8 +798,9 @@ static inline void mwl_tx_count_packet(struct ieee80211_sta *sta, u8 tid) if (jiffies - tx_stats->start_time > HZ) { tx_stats->pkts = 0; tx_stats->start_time = 0; - } else + } else { tx_stats->pkts++; + } } static inline void mwl_tx_skbs(struct ieee80211_hw *hw) @@ -830,7 +825,7 @@ static inline void mwl_tx_skbs(struct ieee80211_hw *hw) while (skb_queue_len(&priv->txq[num]) > 0) { desc = &priv->desc_data[num]; - if (desc->pnext_tx_desc == NULL) + if (!desc->pnext_tx_desc) break; /* Only queue to tx desc when Status is 0 (not when 0x1 diff --git a/mwl_tx.h b/mwl_tx.h index c899215..20a8772 100644 --- a/mwl_tx.h +++ b/mwl_tx.h @@ -14,10 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* -* -* Description: This file defines transmit related functions. -* +/* Description: This file defines transmit related functions. */ #ifndef _mwl_tx_h_ -- cgit v1.2.3