* [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator
@ 2015-06-02 8:55 Stanislav Kholmanskikh
2015-06-02 8:55 ` [PATCH v3 2/2] staging: wilc1000: Align enum members in coreconfigurator Stanislav Kholmanskikh
2015-06-08 19:41 ` [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator Greg KH
0 siblings, 2 replies; 4+ messages in thread
From: Stanislav Kholmanskikh @ 2015-06-02 8:55 UTC (permalink / raw)
To: gregkh, johnny.kim, rachel.kim, dean.lee, chris.park, devel
Cc: linux-wireless, linux-kernel, Stanislav Kholmanskikh
Fixed several syntax/style issues found with checkpatch.pl.
Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
---
Changes since V2:
* The first 2 patches were removed, because what they fix is already fixed now.
drivers/staging/wilc1000/coreconfigurator.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index e3e3f20..43864dc 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -28,7 +28,7 @@
#define INVALID 255
#define MAC_ADDR_LEN 6
#define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \
- BEACON_INTERVAL_LEN + CAP_INFO_LEN)
+ BEACON_INTERVAL_LEN + CAP_INFO_LEN)
/*****************************************************************************/
/* Function Macros */
@@ -672,14 +672,14 @@ INLINE WILC_Uint16 get_asoc_id(u8 *data)
WILC_Sint32 CoreConfiguratorInit(void)
{
WILC_Sint32 s32Error = WILC_SUCCESS;
- PRINT_D(CORECONFIG_DBG, "CoreConfiguratorInit() \n");
+ PRINT_D(CORECONFIG_DBG, "CoreConfiguratorInit()\n");
sema_init(&SemHandleSendPkt, 1);
sema_init(&SemHandlePktResp, 0);
gps8ConfigPacket = (WILC_Sint8 *)WILC_MALLOC(MAX_PACKET_BUFF_SIZE);
if (gps8ConfigPacket == NULL) {
- PRINT_ER("failed in gps8ConfigPacket allocation \n");
+ PRINT_ER("failed in gps8ConfigPacket allocation\n");
s32Error = WILC_NO_MEM;
goto _fail_;
}
@@ -710,13 +710,13 @@ u8 *get_tim_elm(u8 *pu8msa, WILC_Uint16 u16RxLen, WILC_Uint16 u16TagParamOffset)
/* Search for the TIM Element Field and return if the element is found */
while (u16index < (u16RxLen - FCS_LEN)) {
if (pu8msa[u16index] == ITIM) {
- return(&pu8msa[u16index]);
+ return &pu8msa[u16index];
} else {
u16index += (IE_HDR_LEN + pu8msa[u16index + 1]);
}
}
- return(0);
+ return 0;
}
/* This function gets the current channel information from
@@ -728,7 +728,7 @@ u8 get_current_channel_802_11n(u8 *pu8msa, WILC_Uint16 u16RxLen)
index = TAG_PARAM_OFFSET;
while (index < (u16RxLen - FCS_LEN)) {
if (pu8msa[index] == IDSPARMS)
- return (pu8msa[index + 2]);
+ return pu8msa[index + 2];
else
/* Increment index by length information and header */
index += pu8msa[index + 1] + IE_HDR_LEN;
@@ -750,7 +750,7 @@ u8 get_current_channel(u8 *pu8msa, WILC_Uint16 u16RxLen)
#else /* FIVE_GHZ_BAND */
/* Extract current channel information from */
/* the beacon/probe response frame */
- return (get_current_channel_802_11n(pu8msa, u16RxLen));
+ return get_current_channel_802_11n(pu8msa, u16RxLen);
#endif /* FIVE_GHZ_BAND */
#else
return 0;
@@ -1444,7 +1444,7 @@ void ProcessAdrWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
void ProcessBinWid(WILC_Char *pcPacket, WILC_Sint32 *ps32PktLen,
tstrWID *pstrWID, u8 *pu8val, WILC_Sint32 s32ValueSize)
{
- /* WILC_ERROR("processing Binary WIDs is not supported \n"); */
+ /* WILC_ERROR("processing Binary WIDs is not supported\n"); */
WILC_Uint16 u16MsgLen = 0;
WILC_Uint16 idx = 0;
@@ -1583,7 +1583,7 @@ WILC_Sint32 further_process_response(u8 *resp,
WILC_memcpy(pstrWIDresult->ps8WidVal, cfg_str, cfg_len); /* mostafa: no need currently for the extra NULL byte */
pstrWIDresult->s32ValueSize = cfg_len;
} else {
- PRINT_ER("allocated WID buffer length is smaller than the received WID Length \n");
+ PRINT_ER("allocated WID buffer length is smaller than the received WID Length\n");
retval = -2;
}
@@ -2027,7 +2027,7 @@ WILC_Sint32 ConfigProvideResponse(WILC_Char *pcRespBuffer, WILC_Sint32 s32RespLe
} else {
WILC_memcpy(gstrConfigPktInfo.pcRespBuffer, pcRespBuffer, gstrConfigPktInfo.s32MaxRespBuffLen);
gstrConfigPktInfo.s32BytesRead = gstrConfigPktInfo.s32MaxRespBuffLen;
- PRINT_ER("BusProvideResponse() Response greater than the prepared Buffer Size \n");
+ PRINT_ER("BusProvideResponse() Response greater than the prepared Buffer Size\n");
}
up(&SemHandlePktResp);
@@ -2076,7 +2076,7 @@ WILC_Sint32 ConfigPktReceived(u8 *pu8RxPacket, WILC_Sint32 s32RxPacketLen)
break;
default:
- PRINT_ER("ConfigPktReceived(): invalid received msg type at the Core Configurator \n");
+ PRINT_ER("ConfigPktReceived(): invalid received msg type at the Core Configurator\n");
break;
}
@@ -2097,7 +2097,7 @@ WILC_Sint32 CoreConfiguratorDeInit(void)
{
WILC_Sint32 s32Error = WILC_SUCCESS;
- PRINT_D(CORECONFIG_DBG, "CoreConfiguratorDeInit() \n");
+ PRINT_D(CORECONFIG_DBG, "CoreConfiguratorDeInit()\n");
if (gps8ConfigPacket != NULL) {
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] staging: wilc1000: Align enum members in coreconfigurator
2015-06-02 8:55 [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator Stanislav Kholmanskikh
@ 2015-06-02 8:55 ` Stanislav Kholmanskikh
2015-06-08 19:41 ` [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Stanislav Kholmanskikh @ 2015-06-02 8:55 UTC (permalink / raw)
To: gregkh, johnny.kim, rachel.kim, dean.lee, chris.park, devel
Cc: linux-wireless, linux-kernel, Stanislav Kholmanskikh
Aligned enum members to follow a common style per enum.
Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
---
drivers/staging/wilc1000/coreconfigurator.c | 29 +++++++-------
drivers/staging/wilc1000/coreconfigurator.h | 62 ++++++++++++++---------------
2 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 43864dc..c55ed9d 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -40,11 +40,12 @@
/*****************************************************************************/
/* Basic Frame Type Codes (2-bit) */
-typedef enum {FRAME_TYPE_CONTROL = 0x04,
- FRAME_TYPE_DATA = 0x08,
- FRAME_TYPE_MANAGEMENT = 0x00,
- FRAME_TYPE_RESERVED = 0x0C,
- FRAME_TYPE_FORCE_32BIT = 0xFFFFFFFF
+typedef enum {
+ FRAME_TYPE_CONTROL = 0x04,
+ FRAME_TYPE_DATA = 0x08,
+ FRAME_TYPE_MANAGEMENT = 0x00,
+ FRAME_TYPE_RESERVED = 0x0C,
+ FRAME_TYPE_FORCE_32BIT = 0xFFFFFFFF
} tenuBasicFrmType;
/* Frame Type and Subtype Codes (6-bit) */
@@ -188,7 +189,7 @@ static tstrWID gastrWIDs[] = {
{WID_QOS_ENABLE, WID_CHAR},
{WID_11I_MODE, WID_CHAR},
{WID_CURRENT_TX_RATE, WID_CHAR},
- {WID_LINKSPEED, WID_CHAR},
+ {WID_LINKSPEED, WID_CHAR},
{WID_RTS_THRESHOLD, WID_SHORT},
{WID_FRAG_THRESHOLD, WID_SHORT},
{WID_SSID, WID_STR},
@@ -223,14 +224,14 @@ static tstrWID gastrWIDs[] = {
{WID_MEMORY_ACCESS_32BIT, WID_INT},
{WID_MEMORY_ACCESS_16BIT, WID_SHORT},
{WID_MEMORY_ACCESS_8BIT, WID_CHAR},
- {WID_SITE_SURVEY_RESULTS, WID_STR},
- {WID_PMKID_INFO, WID_STR},
- {WID_ASSOC_RES_INFO, WID_STR},
- {WID_MANUFACTURER, WID_STR}, /* 4 Wids added for the CAPI tool*/
- {WID_MODEL_NAME, WID_STR},
- {WID_MODEL_NUM, WID_STR},
- {WID_DEVICE_NAME, WID_STR},
- {WID_SSID_PROBE_REQ, WID_STR},
+ {WID_SITE_SURVEY_RESULTS, WID_STR},
+ {WID_PMKID_INFO, WID_STR},
+ {WID_ASSOC_RES_INFO, WID_STR},
+ {WID_MANUFACTURER, WID_STR}, /* 4 Wids added for the CAPI tool*/
+ {WID_MODEL_NAME, WID_STR},
+ {WID_MODEL_NUM, WID_STR},
+ {WID_DEVICE_NAME, WID_STR},
+ {WID_SSID_PROBE_REQ, WID_STR},
#ifdef MAC_802_11N
{WID_11N_ENABLE, WID_CHAR},
diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h
index 73cdbef..b8e5241 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -19,9 +19,9 @@
/*****************************************************************************/
/* Number of WID Options Supported */
#define NUM_BASIC_SWITCHES 45
-#define NUM_FHSS_SWITCHES 0
+#define NUM_FHSS_SWITCHES 0
-#define NUM_RSSI 5
+#define NUM_RSSI 5
#ifdef MAC_802_11N
#define NUM_11N_BASIC_SWITCHES 25
@@ -51,14 +51,14 @@ extern WILC_Uint16 g_num_total_switches;
#define MAX_PACKET_BUFF_SIZE 1596
-#define MAX_STRING_LEN 256
-#define MAX_SURVEY_RESULT_FRAG_SIZE MAX_STRING_LEN
-#define SURVEY_RESULT_LENGTH 44
-#define MAX_ASSOC_RESP_FRAME_SIZE MAX_STRING_LEN
+#define MAX_STRING_LEN 256
+#define MAX_SURVEY_RESULT_FRAG_SIZE MAX_STRING_LEN
+#define SURVEY_RESULT_LENGTH 44
+#define MAX_ASSOC_RESP_FRAME_SIZE MAX_STRING_LEN
-#define STATUS_MSG_LEN 12
-#define MAC_CONNECTED 1
-#define MAC_DISCONNECTED 0
+#define STATUS_MSG_LEN 12
+#define MAC_CONNECTED 1
+#define MAC_DISCONNECTED 0
@@ -327,10 +327,10 @@ typedef enum {
WID_SUPP_PASSWORD = 0x3011,
WID_SITE_SURVEY_RESULTS = 0x3012,
WID_RX_POWER_LEVEL = 0x3013,
- WID_MANUFACTURER = 0x3026, /*Added for CAPI tool */
- WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */
- WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */
- WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */
+ WID_MANUFACTURER = 0x3026, /*Added for CAPI tool */
+ WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */
+ WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */
+ WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */
WID_ASSOC_RES_INFO = 0x3020,
@@ -362,9 +362,9 @@ typedef enum {
WID_HUT_LOG_STATS = 0x4083,
/*BugID_3746 WID to add IE to be added in next probe request*/
- WID_INFO_ELEMENT_PROBE = 0x4085,
+ WID_INFO_ELEMENT_PROBE = 0x4085,
/*BugID_3746 WID to add IE to be added in next associate request*/
- WID_INFO_ELEMENT_ASSOCIATE = 0x4086,
+ WID_INFO_ELEMENT_ASSOCIATE = 0x4086,
/* Miscellaneous WIDs */
WID_ALL = 0x7FFE,
@@ -374,22 +374,22 @@ typedef enum {
/* Status Codes for Authentication and Association Frames */
typedef enum {
- SUCCESSFUL_STATUSCODE = 0,
- UNSPEC_FAIL = 1,
- UNSUP_CAP = 10,
- REASOC_NO_ASOC = 11,
- FAIL_OTHER = 12,
- UNSUPT_ALG = 13,
- AUTH_SEQ_FAIL = 14,
- CHLNG_FAIL = 15,
- AUTH_TIMEOUT = 16,
- AP_FULL = 17,
- UNSUP_RATE = 18,
- SHORT_PREAMBLE_UNSUP = 19,
- PBCC_UNSUP = 20,
- CHANNEL_AGIL_UNSUP = 21,
- SHORT_SLOT_UNSUP = 25,
- OFDM_DSSS_UNSUP = 26,
+ SUCCESSFUL_STATUSCODE = 0,
+ UNSPEC_FAIL = 1,
+ UNSUP_CAP = 10,
+ REASOC_NO_ASOC = 11,
+ FAIL_OTHER = 12,
+ UNSUPT_ALG = 13,
+ AUTH_SEQ_FAIL = 14,
+ CHLNG_FAIL = 15,
+ AUTH_TIMEOUT = 16,
+ AP_FULL = 17,
+ UNSUP_RATE = 18,
+ SHORT_PREAMBLE_UNSUP = 19,
+ PBCC_UNSUP = 20,
+ CHANNEL_AGIL_UNSUP = 21,
+ SHORT_SLOT_UNSUP = 25,
+ OFDM_DSSS_UNSUP = 26,
CONNECT_STS_FORCE_16_BIT = 0xFFFF
} tenuConnectSts;
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator
2015-06-02 8:55 [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator Stanislav Kholmanskikh
2015-06-02 8:55 ` [PATCH v3 2/2] staging: wilc1000: Align enum members in coreconfigurator Stanislav Kholmanskikh
@ 2015-06-08 19:41 ` Greg KH
2015-06-08 20:55 ` Stanislav Kholmanskikh
1 sibling, 1 reply; 4+ messages in thread
From: Greg KH @ 2015-06-08 19:41 UTC (permalink / raw)
To: Stanislav Kholmanskikh
Cc: johnny.kim, rachel.kim, dean.lee, chris.park, devel,
linux-wireless, linux-kernel
On Tue, Jun 02, 2015 at 12:55:06PM +0400, Stanislav Kholmanskikh wrote:
> Fixed several syntax/style issues found with checkpatch.pl.
What exactly is "several"? Please be specific as to what type of
changes you are making.
Please fix and resend both of these.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator
2015-06-08 19:41 ` [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator Greg KH
@ 2015-06-08 20:55 ` Stanislav Kholmanskikh
0 siblings, 0 replies; 4+ messages in thread
From: Stanislav Kholmanskikh @ 2015-06-08 20:55 UTC (permalink / raw)
To: Greg KH
Cc: johnny.kim, rachel.kim, dean.lee, chris.park, devel,
linux-wireless, linux-kernel
On Mon, Jun 08, 2015 at 12:41:08PM -0700, Greg KH wrote:
> On Tue, Jun 02, 2015 at 12:55:06PM +0400, Stanislav Kholmanskikh wrote:
> > Fixed several syntax/style issues found with checkpatch.pl.
>
> What exactly is "several"? Please be specific as to what type of
> changes you are making.
>
> Please fix and resend both of these.
Sorry. I put a more detailed description and sent V4.
Thanks.
>
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-08 20:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-02 8:55 [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator Stanislav Kholmanskikh
2015-06-02 8:55 ` [PATCH v3 2/2] staging: wilc1000: Align enum members in coreconfigurator Stanislav Kholmanskikh
2015-06-08 19:41 ` [PATCH v3 1/2] staging: wilc1000: Cleanup to coreconfigurator Greg KH
2015-06-08 20:55 ` Stanislav Kholmanskikh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).