[PATCH 2662/2662] Staging: android: Fix 80 character length
This patch is to the Kconfig file which fixes up lines which exceeded the standard 80 character limitation. This file also fixes up 3 warnings regarding paragraph. Signed-off-by: Punit Vara --- drivers/staging/android/Kconfig | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index 42b1512..f4a2371 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -12,7 +12,8 @@ config ASHMEM file-based API. It is, in theory, a good memory allocator for low-memory devices, - because it can discard shared memory units when under memory pressure. + because it can discard shared memory units when under memory + pressure. config ANDROID_TIMED_OUTPUT bool "Timed output class driver" @@ -24,19 +25,20 @@ config ANDROID_TIMED_GPIO depends on ANDROID_TIMED_OUTPUT default n ---help--- - Unlike generic gpio is to allow programs to access and manipulate gpio - registers from user space, timed output/gpio is a system to allow changing - a gpio pin and restore it automatically after a specified timeout. + Unlike generic gpio is to allow programs to access and manipulate + gpio registers from user space, timed output/gpio is a system to + allow changing a gpio pin and restore it automatically after a + specified timeout. config ANDROID_LOW_MEMORY_KILLER bool "Android Low Memory Killer" ---help--- - Registers processes to be killed when low memory conditions, this is useful - as there is no particular swap space on android. + Registers processes to be killed when low memory conditions, this + is useful as there is no particular swap space on android. - The registered process will kills according to the priorities in android init - scripts (/init.rc), and it defines priority values with minimum free memory size - for each priority. + The registered process will kills according to the priorities in + android init scripts (/init.rc), and it defines priority values with + minimum free memory size for each priority. config SYNC bool "Synchronization framework" @@ -44,8 +46,9 @@ config SYNC select ANON_INODES select DMA_SHARED_BUFFER ---help--- - This option enables the framework for synchronization between multiple - drivers. Sync implementations can take advantage of hardware + This option enables the framework for synchronization between + multiple drivers. + Sync implementations can take advantage of hardware synchronization built into devices like GPUs. config SW_SYNC @@ -54,7 +57,8 @@ config SW_SYNC depends on SYNC ---help--- A sync object driver that uses a 32bit counter to coordinate - synchronization. Useful when there is no hardware primitive backing + synchronization. + Useful when there is no hardware primitive backing the synchronization. config SW_SYNC_USER -- 2.5.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2662/2662] Staging: android: Fix 80 character length
On Fri, Sep 18, 2015 at 12:38:21PM +0530, Punit Vara wrote: > This patch is to the Kconfig file which fixes up lines which > exceeded the standard 80 character limitation. > This file also fixes up 3 warnings regarding paragraph. > > Signed-off-by: Punit Vara > --- Your subject says 2662/2662. Then where are your 2661 earlier patches of the series? No, that is wrong. The numbers we use when we submit a series of patches. But for a single patch (1/1) numbers are not required and 2662 is definitely wrong. regards sudip ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: android: Fix 80 character length
This patch is to the Kconfig file which fixes up lines which exceeded the standard 80 character limitation. This file also fixes up 3 warnings regarding paragraph. Signed-off-by: Punit Vara --- drivers/staging/android/Kconfig | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index 42b1512..f4a2371 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig @@ -12,7 +12,8 @@ config ASHMEM file-based API. It is, in theory, a good memory allocator for low-memory devices, - because it can discard shared memory units when under memory pressure. + because it can discard shared memory units when under memory + pressure. config ANDROID_TIMED_OUTPUT bool "Timed output class driver" @@ -24,19 +25,20 @@ config ANDROID_TIMED_GPIO depends on ANDROID_TIMED_OUTPUT default n ---help--- - Unlike generic gpio is to allow programs to access and manipulate gpio - registers from user space, timed output/gpio is a system to allow changing - a gpio pin and restore it automatically after a specified timeout. + Unlike generic gpio is to allow programs to access and manipulate + gpio registers from user space, timed output/gpio is a system to + allow changing a gpio pin and restore it automatically after a + specified timeout. config ANDROID_LOW_MEMORY_KILLER bool "Android Low Memory Killer" ---help--- - Registers processes to be killed when low memory conditions, this is useful - as there is no particular swap space on android. + Registers processes to be killed when low memory conditions, this + is useful as there is no particular swap space on android. - The registered process will kills according to the priorities in android init - scripts (/init.rc), and it defines priority values with minimum free memory size - for each priority. + The registered process will kills according to the priorities in + android init scripts (/init.rc), and it defines priority values with + minimum free memory size for each priority. config SYNC bool "Synchronization framework" @@ -44,8 +46,9 @@ config SYNC select ANON_INODES select DMA_SHARED_BUFFER ---help--- - This option enables the framework for synchronization between multiple - drivers. Sync implementations can take advantage of hardware + This option enables the framework for synchronization between + multiple drivers. + Sync implementations can take advantage of hardware synchronization built into devices like GPUs. config SW_SYNC @@ -54,7 +57,8 @@ config SW_SYNC depends on SYNC ---help--- A sync object driver that uses a 32bit counter to coordinate - synchronization. Useful when there is no hardware primitive backing + synchronization. + Useful when there is no hardware primitive backing the synchronization. config SW_SYNC_USER -- 2.5.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 05/34] staging: wilc1000 remove typedef from the union
This patch gets rid of typedef from the union and renames tuniHostIFmsgBody
with simply message_body because the Linux coding style does not recommend
camelcase notation and typedef for structure, enmu and also union.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index d215b12..6cb35aa 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -409,7 +409,7 @@ typedef struct {
} tstrHostIfStaInactiveT;
/**/
/*!
- * @union tuniHostIFmsgBody
+ * @union message_body
* @brief Message body for the Host Interface message_q
* @details
* @todo
@@ -418,7 +418,7 @@ typedef struct {
* @date 25 March 2012
* @version 1.0
*/
-typedef union _tuniHostIFmsgBody {
+union message_body {
tstrHostIFscanAttr strHostIFscanAttr; /*!<
Host IF Scan Request Attributes message body */
tstrHostIFconnectAttr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
@@ -447,7 +447,7 @@ typedef union _tuniHostIFmsgBody {
tstrHostIfRegisterFrame strHostIfRegisterFrame;
char *pUserData;
tstrHostIFDelAllSta strHostIFDelAllSta;
-} tuniHostIFmsgBody;
+};
/*!
* @struct struct host_if_msg
@@ -461,7 +461,7 @@ typedef union _tuniHostIFmsgBody {
*/
struct host_if_msg {
u16 id; /*!< Message ID */
- tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
+ union message_body uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 06/34] staging: wilc1000: rename uniHostIFmsgBody
This patch changes the camelcase notation, uniHostIFmsgBody which is a member
variable of structure host_if_msg to body in order to comply with the Linux
coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 296 +++---
1 file changed, 148 insertions(+), 148 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 6cb35aa..8b1aa2f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -461,7 +461,7 @@ union message_body {
*/
struct host_if_msg {
u16 id; /*!< Message ID */
- union message_body uniHostIFmsgBody; /*!< Message body */
+ union message_body body; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
};
@@ -3993,7 +3993,7 @@ static void ListenTimerCB(unsigned long arg)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drvHandler = pstrWFIDrv;
- msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID =
pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
+ msg.body.strHostIfRemainOnChan.u32ListenSessionID =
pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4350,11 +4350,11 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_SCAN:
- Handle_Scan(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFscanAttr);
+ Handle_Scan(msg.drvHandler,
&msg.body.strHostIFscanAttr);
break;
case HOST_IF_MSG_CONNECT:
- Handle_Connect(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFconnectAttr);
+ Handle_Connect(msg.drvHandler,
&msg.body.strHostIFconnectAttr);
break;
/*BugID_5137*/
@@ -4363,24 +4363,24 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_RCVD_NTWRK_INFO:
- Handle_RcvdNtwrkInfo(msg.drvHandler,
&msg.uniHostIFmsgBody.strRcvdNetworkInfo);
+ Handle_RcvdNtwrkInfo(msg.drvHandler,
&msg.body.strRcvdNetworkInfo);
break;
case HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO:
- Handle_RcvdGnrlAsyncInfo(msg.drvHandler,
&msg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo);
+ Handle_RcvdGnrlAsyncInfo(msg.drvHandler,
&msg.body.strRcvdGnrlAsyncInfo);
break;
case HOST_IF_MSG_KEY:
- Handle_Key(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFkeyAttr);
+ Handle_Key(msg.drvHandler, &msg.body.strHostIFkeyAttr);
break;
case HOST_IF_MSG_CFG_PARAMS:
- Handle_CfgParam(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFCfgParamAttr);
+ Handle_CfgParam(msg.drvHandler,
&msg.body.strHostIFCfgParamAttr);
break;
case HOST_IF_MSG_SET_CHANNEL:
- Handle_SetChannel(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFSetChan);
+ Handle_SetChannel(msg.drvHandler,
&msg.body.strHostIFSetChan);
break;
case HOST_IF_MSG_DISCONNECT:
@@ -4399,7 +4399,7 @@ static int hostIFthread(void *pvArg)
Handle_ScanDone(msg.drvHandler, SCAN_EVENT_DONE);
if (pstrWFIDrv->u8RemainOnChan_pendingreq)
- Handle_RemainOnChan(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIfRemainOnChan);
+ Handle_RemainOnChan(msg.drvHandler,
&msg.body.strHostIfRemainOnChan);
break;
@@ -4412,7 +4412,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_GET_STATISTICS:
- Handle_GetStatistics(msg.drvHandler, (tstrStatistics
*)msg.uniHostIFmsgBody.pUserData);
+ Handle_GetStatistics(msg.drvHandler, (tstrStatistics
*)msg.body.pUserData);
break;
case HOST_IF_MSG_GET_CHNL:
@@ -4420,27 +4420,27 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_ADD_BEACON:
- Handle_AddBeacon(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFSetBeacon);
+ Handle_AddBeacon(msg.drvHandler,
&msg.body.strHostIFSetBeacon);
break;
case HOST_IF_MSG_DEL_BEACON:
- Handle_DelBeacon(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFDelBeacon);
+
[PATCH 02/34] staging: wilc1000: remove typedef from the struct
The Linux kernel coding style does not recommend to use typedef for the
structure. This patch removes typedef from the host_if_msg structure.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 294 +++---
1 file changed, 147 insertions(+), 147 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index d272091..7ffec1b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -450,7 +450,7 @@ typedef union _tuniHostIFmsgBody {
} tuniHostIFmsgBody;
/*!
- * @struct host_if_msg
+ * @struct struct host_if_msg
* @brief Host Interface message
* @details
* @todo
@@ -459,11 +459,11 @@ typedef union _tuniHostIFmsgBody {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _host_if_msg {
+struct host_if_msg {
u16 u16MsgId; /*!< Message ID
*/
tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
-} host_if_msg;
+};
#ifdef CONNECT_DIRECT
typedef struct _tstrWidJoinReqExt {
@@ -3984,19 +3984,19 @@ _done_:
static void ListenTimerCB(unsigned long arg)
{
s32 s32Error = 0;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg;
/*Stopping remain-on-channel timer*/
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
strHostIFmsg.drvHandler = pstrWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID
= pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
}
@@ -4315,13 +4315,13 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv
*drvHandler, tstrHostIfBASe
static int hostIFthread(void *pvArg)
{
u32 u32Ret;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv;
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
while (1) {
- wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg),
&u32Ret);
+ wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg), &u32Ret);
pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
@@ -4333,13 +4333,13 @@ static int hostIFthread(void *pvArg)
if ((!g_wilc_initialized)) {
PRINT_D(GENERIC_DBG, "--WAIT--");
usleep_range(200 * 1000, 200 * 1000);
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg));
continue;
}
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT &&
pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan
done received\n");
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
@@ -4533,29 +4533,29 @@ static int hostIFthread(void *pvArg)
static void TimerCB_Scan(unsigned long arg)
{
void *pvArg = (void *)arg;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(host_if_msg));
+ memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
strHostIFmsg.drvHandler = pvArg;
strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct host_if_msg));
}
static void TimerCB_Connect(unsigned long arg)
{
void *pvArg = (void *)arg;
- host_if_msg strHostIFmsg;
+ struct host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg,
[PATCH 03/34] staging: wilc1000: rename strHostIFmsg
This patch changes the name, strHostIFmsg simply to msg because the
camelcase notation is not recommended in Linux.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 794 +++---
1 file changed, 397 insertions(+), 397 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 7ffec1b..e03ca8f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -3984,19 +3984,19 @@ _done_:
static void ListenTimerCB(unsigned long arg)
{
s32 s32Error = 0;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg;
/*Stopping remain-on-channel timer*/
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
- strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
- strHostIFmsg.drvHandler = pstrWFIDrv;
- strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID
= pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
+ memset(&msg, 0, sizeof(struct host_if_msg));
+ msg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
+ msg.drvHandler = pstrWFIDrv;
+ msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID =
pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
}
@@ -4315,15 +4315,15 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv
*drvHandler, tstrHostIfBASe
static int hostIFthread(void *pvArg)
{
u32 u32Ret;
- struct host_if_msg strHostIFmsg;
+ struct host_if_msg msg;
tstrWILC_WFIDrv *pstrWFIDrv;
- memset(&strHostIFmsg, 0, sizeof(struct host_if_msg));
+ memset(&msg, 0, sizeof(struct host_if_msg));
while (1) {
- wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg), &u32Ret);
- pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
- if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
+ wilc_mq_recv(&gMsgQHostIF, &msg, sizeof(struct host_if_msg),
&u32Ret);
+ pstrWFIDrv = (tstrWILC_WFIDrv *)msg.drvHandler;
+ if (msg.u16MsgId == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
break;
}
@@ -4333,58 +4333,58 @@ static int hostIFthread(void *pvArg)
if ((!g_wilc_initialized)) {
PRINT_D(GENERIC_DBG, "--WAIT--");
usleep_range(200 * 1000, 200 * 1000);
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct
host_if_msg));
continue;
}
- if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT &&
pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
+ if (msg.u16MsgId == HOST_IF_MSG_CONNECT &&
pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan
done received\n");
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(struct
host_if_msg));
+ wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct
host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
- switch (strHostIFmsg.u16MsgId) {
+ switch (msg.u16MsgId) {
case HOST_IF_MSG_Q_IDLE:
Handle_wait_msg_q_empty();
break;
case HOST_IF_MSG_SCAN:
- Handle_Scan(strHostIFmsg.drvHandler,
&strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr);
+ Handle_Scan(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFscanAttr);
break;
case HOST_IF_MSG_CONNECT:
- Handle_Connect(strHostIFmsg.drvHandler,
&strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr);
+ Handle_Connect(msg.drvHandler,
&msg.uniHostIFmsgBody.strHostIFconnectAttr);
break;
/*BugID_5137*/
case HOST_IF_MSG_FLUSH_CONNECT:
- Handle_FlushConnect(strHostIFmsg.drvHandler);
+ Handle_FlushConnect(msg.drvHandler);
break;
case HOST_IF_MSG_RCVD_NTWRK_INFO:
- Handle_RcvdNtwrkInfo(strHostIFmsg.drvHandler,
[PATCH 09/34] staging: wilc1000: remove typedef from the struct tstrRcvdNetworkInfo
This patch removes typedef from the struct tstrRcvdNetworkInfo and
renames it to rcvd_net_info in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 7 ---
drivers/staging/wilc1000/host_interface.h | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 7f1b801..803c36d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -420,7 +420,7 @@ typedef struct {
union message_body {
struct scan_attr strHostIFscanAttr; /*!< Host
IF Scan Request Attributes message body */
struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
- tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
+ struct rcvd_net_info strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
tstrHostIFCfgParamAttr strHostIFCfgParamAttr;/*! */
@@ -2262,13 +2262,14 @@ static s32 Handle_ConnectTimeout(tstrWILC_WFIDrv
*drvHandler)
/**
* @brief Handle_RcvdNtwrkInfo
* @details Handling received network information
- * @param[in]tstrRcvdNetworkInfo* pstrRcvdNetworkInfo
+ * @param[in]struct rcvd_net_info *pstrRcvdNetworkInfo
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler,
tstrRcvdNetworkInfo *pstrRcvdNetworkInfo)
+static s32 Handle_RcvdNtwrkInfo(tstrWILC_WFIDrv *drvHandler,
+ struct rcvd_net_info *pstrRcvdNetworkInfo)
{
u32 i;
bool bNewNtwrkFound;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index fd5fa19..e069a08 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -202,7 +202,7 @@ typedef struct {
} *WILC_WFIDrvHandle;
/*!
- * @struct tstrRcvdNetworkInfo
+ * @struct rcvd_net_info
* @brief Structure to hold Received Asynchronous Network info
* @details
* @todo
@@ -211,10 +211,10 @@ typedef struct {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrRcvdNetworkInfo {
+struct rcvd_net_info {
u8 *pu8Buffer;
u32 u32Length;
-} tstrRcvdNetworkInfo;
+};
/*BugID_4156*/
typedef struct _tstrHiddenNetworkInfo {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 04/34] staging: wilc1000: rename u16MsgId
This patch changes the name, u16MsgId simply to id to avoid the camelcase
notation.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 102 +++---
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index e03ca8f..d215b12 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -460,7 +460,7 @@ typedef union _tuniHostIFmsgBody {
* @version 1.0
*/
struct host_if_msg {
- u16 u16MsgId; /*!< Message ID
*/
+ u16 id; /*!< Message ID */
tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
};
@@ -3991,7 +3991,7 @@ static void ListenTimerCB(unsigned long arg)
/* prepare the Timer Callback message */
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
+ msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drvHandler = pstrWFIDrv;
msg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID =
pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
@@ -4323,7 +4323,7 @@ static int hostIFthread(void *pvArg)
while (1) {
wilc_mq_recv(&gMsgQHostIF, &msg, sizeof(struct host_if_msg),
&u32Ret);
pstrWFIDrv = (tstrWILC_WFIDrv *)msg.drvHandler;
- if (msg.u16MsgId == HOST_IF_MSG_EXIT) {
+ if (msg.id == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
break;
}
@@ -4337,14 +4337,14 @@ static int hostIFthread(void *pvArg)
continue;
}
- if (msg.u16MsgId == HOST_IF_MSG_CONNECT &&
pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
+ if (msg.id == HOST_IF_MSG_CONNECT &&
pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan
done received\n");
wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct
host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
- switch (msg.u16MsgId) {
+ switch (msg.id) {
case HOST_IF_MSG_Q_IDLE:
Handle_wait_msg_q_empty();
break;
@@ -4538,7 +4538,7 @@ static void TimerCB_Scan(unsigned long arg)
/* prepare the Timer Callback message */
memset(&msg, 0, sizeof(struct host_if_msg));
msg.drvHandler = pvArg;
- msg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
+ msg.id = HOST_IF_MSG_SCAN_TIMER_FIRED;
/* send the message */
wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4552,7 +4552,7 @@ static void TimerCB_Connect(unsigned long arg)
/* prepare the Timer Callback message */
memset(&msg, 0, sizeof(struct host_if_msg));
msg.drvHandler = pvArg;
- msg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
+ msg.id = HOST_IF_MSG_CONNECT_TIMER_FIRED;
/* send the message */
wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg));
@@ -4618,7 +4618,7 @@ s32 host_int_remove_wep_key(tstrWILC_WFIDrv *hWFIDrv, u8
u8keyIdx)
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = REMOVEKEY;
msg.drvHandler = hWFIDrv;
@@ -4666,7 +4666,7 @@ s32 host_int_set_WEPDefaultKeyID(tstrWILC_WFIDrv
*hWFIDrv, u8 u8Index)
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = DEFAULTKEY;
msg.drvHandler = hWFIDrv;
@@ -4720,7 +4720,7 @@ s32 host_int_add_wep_key_bss_sta(tstrWILC_WFIDrv
*hWFIDrv, const u8 *pu8WepKey,
memset(&msg, 0, sizeof(struct host_if_msg));
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
msg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
msg.drvHandler = hWFIDrv;
@@ -4786,7 +4786,7 @@ s32 host_int_add_wep_key_bss_ap(tstrWILC_WFIDrv *hWFIDrv,
const u8 *pu8WepKey, u
for (i = 0; i < u8WepKeylen; i++)
PRINT_INFO(HOSTAPD_DBG, "KEY is %x\n", pu8WepKey[i]);
}
- msg.u16MsgId = HOST_IF_MSG_KEY;
+ msg.id = HOST_IF_MSG_KEY;
msg.uniHostIFmsgBody.strHostIFkeyAttr.enuKeyType = WEP;
[PATCH 07/34] staging: wilc1000: remove typedef from the struct tstrHostIFscanAttr
This patch removes typedef from the structure tstrHostIFscanAttr and
changes the camelcase name, tstrHostIFscanAttr to scan_attr in order to
comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 8b1aa2f..4a02e10 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -155,7 +155,7 @@ typedef struct _tstrHostIFkeyAttr {
/*!
- * @struct tstrHostIFscanAttr
+ * @struct scan_attr
* @brief Structure to hold Host IF Scan Attributes
* @details
* @todo
@@ -164,7 +164,7 @@ typedef struct _tstrHostIFkeyAttr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFscanAttr {
+struct scan_attr {
u8 u8ScanSource;
u8 u8ScanType;
u8 *pu8ChnlFreqList;
@@ -175,8 +175,7 @@ typedef struct _tstrHostIFscanAttr {
void *pvUserArg;
/*BugID_4189*/
tstrHiddenNetwork strHiddenNetwork;
-
-} tstrHostIFscanAttr;
+};
/*!
* @struct tstrHostIFconnectAttr
@@ -419,7 +418,7 @@ typedef struct {
* @version 1.0
*/
union message_body {
- tstrHostIFscanAttr strHostIFscanAttr; /*!<
Host IF Scan Request Attributes message body */
+ struct scan_attr strHostIFscanAttr; /*!< Host
IF Scan Request Attributes message body */
tstrHostIFconnectAttr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
@@ -1285,13 +1284,14 @@ static s32 Handle_wait_msg_q_empty(void)
/**
* @brief Handle_Scan
* @details Sending config packet to firmware to set the scan params
- * @param[in]tstrHostIFscanAttr* pstrHostIFscanAttr
+ * @param[in]struct scan_attr *pstrHostIFscanAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler, tstrHostIFscanAttr
*pstrHostIFscanAttr)
+static s32 Handle_Scan(tstrWILC_WFIDrv *drvHandler,
+ struct scan_attr *pstrHostIFscanAttr)
{
s32 s32Error = 0;
tstrWID strWIDList[5];
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/34] staging: wilc1000: remove typedef from the struct tstrHostIFconnectAttr
This patch removes typedef from the struct tstrHostIFconnectAttr and
renames it to connect_attr to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 4a02e10..7f1b801 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -178,7 +178,7 @@ struct scan_attr {
};
/*!
- * @struct tstrHostIFconnectAttr
+ * @struct connect_attr
* @brief Structure to hold Host IF Connect Attributes
* @details
* @todo
@@ -187,7 +187,7 @@ struct scan_attr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFconnectAttr {
+struct connect_attr {
u8 *pu8bssid;
u8 *pu8ssid;
size_t ssidLen;
@@ -199,7 +199,7 @@ typedef struct _tstrHostIFconnectAttr {
AUTHTYPE_T tenuAuth_type;
u8 u8channel;
void *pJoinParams;
-} tstrHostIFconnectAttr;
+};
/*!
* @struct tstrRcvdGnrlAsyncInfo
@@ -419,7 +419,7 @@ typedef struct {
*/
union message_body {
struct scan_attr strHostIFscanAttr; /*!< Host
IF Scan Request Attributes message body */
- tstrHostIFconnectAttr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
+ struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
tstrRcvdNetworkInfo strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
@@ -1512,14 +1512,15 @@ static s32 Handle_ScanDone(tstrWILC_WFIDrv *drvHandler,
tenuScanEvent enuEvent)
/**
* @brief Handle_Connect
* @details Sending config packet to firmware to starting connection
- * @param[in]tstrHostIFconnectAttr* pstrHostIFconnectAttr
+ * @param[in]struct connect_attr *pstrHostIFconnectAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
u8 u8ConnectedSSID[6] = {0};
-static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler, tstrHostIFconnectAttr
*pstrHostIFconnectAttr)
+static s32 Handle_Connect(tstrWILC_WFIDrv *drvHandler,
+ struct connect_attr *pstrHostIFconnectAttr)
{
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler;
s32 s32Error = 0;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/34] staging: wilc1000: rename tstrHostIFmsg
This patch changes the name, tstrHostIFmsg to host_if_msg not to use
camelcase notation in the Linux.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 294 +++---
1 file changed, 147 insertions(+), 147 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 151e8c4..d272091 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -450,7 +450,7 @@ typedef union _tuniHostIFmsgBody {
} tuniHostIFmsgBody;
/*!
- * @struct tstrHostIFmsg
+ * @struct host_if_msg
* @brief Host Interface message
* @details
* @todo
@@ -459,11 +459,11 @@ typedef union _tuniHostIFmsgBody {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFmsg {
+typedef struct _host_if_msg {
u16 u16MsgId; /*!< Message ID
*/
tuniHostIFmsgBody uniHostIFmsgBody; /*!< Message body */
tstrWILC_WFIDrv *drvHandler;
-} tstrHostIFmsg;
+} host_if_msg;
#ifdef CONNECT_DIRECT
typedef struct _tstrWidJoinReqExt {
@@ -3984,19 +3984,19 @@ _done_:
static void ListenTimerCB(unsigned long arg)
{
s32 s32Error = 0;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)arg;
/*Stopping remain-on-channel timer*/
del_timer(&pstrWFIDrv->hRemainOnChannel);
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.u16MsgId = HOST_IF_MSG_LISTEN_TIMER_FIRED;
strHostIFmsg.drvHandler = pstrWFIDrv;
strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID
= pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
/* send the message */
- s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(tstrHostIFmsg));
+ s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(host_if_msg));
if (s32Error)
PRINT_ER("wilc_mq_send fail\n");
}
@@ -4315,13 +4315,13 @@ static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv
*drvHandler, tstrHostIfBASe
static int hostIFthread(void *pvArg)
{
u32 u32Ret;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
tstrWILC_WFIDrv *pstrWFIDrv;
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
while (1) {
- wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg,
sizeof(tstrHostIFmsg), &u32Ret);
+ wilc_mq_recv(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg),
&u32Ret);
pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
@@ -4333,13 +4333,13 @@ static int hostIFthread(void *pvArg)
if ((!g_wilc_initialized)) {
PRINT_D(GENERIC_DBG, "--WAIT--");
usleep_range(200 * 1000, 200 * 1000);
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(tstrHostIFmsg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(host_if_msg));
continue;
}
if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT &&
pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
PRINT_D(HOSTINF_DBG, "Requeue connect request till scan
done received\n");
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(tstrHostIFmsg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg,
sizeof(host_if_msg));
usleep_range(2 * 1000, 2 * 1000);
continue;
}
@@ -4533,29 +4533,29 @@ static int hostIFthread(void *pvArg)
static void TimerCB_Scan(unsigned long arg)
{
void *pvArg = (void *)arg;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg));
strHostIFmsg.drvHandler = pvArg;
strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
/* send the message */
- wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));
+ wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(host_if_msg));
}
static void TimerCB_Connect(unsigned long arg)
{
void *pvArg = (void *)arg;
- tstrHostIFmsg strHostIFmsg;
+ host_if_msg strHostIFmsg;
/* prepare the Timer Callback message */
- memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
+ memset(&strHostIFmsg, 0, sizeof(host_if_msg))
[PATCH 14/34] staging: wilc1000: remove typedef from the struct tstrHostIFGetChan
This patch removes typedef from the struct tstrHostIFGetChan and renames
it to get_channel in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 2f86a3b..58f138b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -230,7 +230,7 @@ struct set_channel {
};
/*!
- * @struct tstrHostIFSetChan
+ * @struct get_channel
* @brief Get Channel message body
* @details
* @todo
@@ -239,9 +239,9 @@ struct set_channel {
* @date 01 Jule 2012
* @version 1.0
*/
-typedef struct _tstrHostIFGetChan {
+struct get_channel {
u8 u8GetChan;
-} tstrHostIFGetChan;
+};
/*bug3819: Add Scan acomplete notification to host*/
/*!
@@ -424,7 +424,7 @@ union message_body {
struct key_attr strHostIFkeyAttr; /*!<>*/
struct cfg_param_attr strHostIFCfgParamAttr;/*! */
struct set_channel strHostIFSetChan;
- tstrHostIFGetChan strHostIFGetChan;
+ struct get_channel strHostIFGetChan;
tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon
message body */
tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon
message body */
tstrWILC_AddStaParam strAddStaParam;/*!< Add
station message body */
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 10/34] staging: wilc1000: remove typedef from the struct tstrRcvdGnrlAsyncInfo
This patch removes typedef from the struct tstrRcvdGnrlAsyncInfo and
renames it to rcvd_async_info in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 803c36d..c80d00e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -202,7 +202,7 @@ struct connect_attr {
};
/*!
- * @struct tstrRcvdGnrlAsyncInfo
+ * @struct rcvd_async_info
* @brief Structure to hold Received General Asynchronous info
* @details
* @todo
@@ -211,10 +211,10 @@ struct connect_attr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrRcvdGnrlAsyncInfo {
+struct rcvd_async_info {
u8 *pu8Buffer;
u32 u32Length;
-} tstrRcvdGnrlAsyncInfo;
+};
/*!
* @struct tstrHostIFSetChan
@@ -421,7 +421,7 @@ union message_body {
struct scan_attr strHostIFscanAttr; /*!< Host
IF Scan Request Attributes message body */
struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
struct rcvd_net_info strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
- tstrRcvdGnrlAsyncInfo strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
+ struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
tstrHostIFCfgParamAttr strHostIFCfgParamAttr;/*! */
tstrHostIFSetChan strHostIFSetChan;
@@ -2381,13 +2381,14 @@ done:
/**
* @brief Handle_RcvdGnrlAsyncInfo
* @details Handling received asynchrous general network information
- * @param[in]tstrRcvdGnrlAsyncInfo* pstrRcvdGnrlAsyncInfo
+ * @param[in] struct rcvd_async_info *pstrRcvdGnrlAsyncInfo
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler,
tstrRcvdGnrlAsyncInfo *pstrRcvdGnrlAsyncInfo)
+static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv *drvHandler,
+ struct rcvd_async_info
*pstrRcvdGnrlAsyncInfo)
{
/* TODO: mostafa: till now, this function just handles only the
received mac status msg, */
/* which carries only 1 WID which have
WID ID = WID_STATUS */
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 11/34] staging: wilc1000: remove typedef from the struct tstrHostIFkeyAttr
This patch removes typedef from the struct tstrHostIFkeyAttr and renames
it to key_attr in oder to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index c80d00e..1f0c842 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -136,7 +136,7 @@ typedef union _tuniHostIFkeyAttr {
} tuniHostIFkeyAttr;
/*!
- * @struct tstrHostIFkeyAttr
+ * @struct key_attr
* @brief Structure to hold Host IF Scan Attributes
* @details
* @todo
@@ -145,11 +145,11 @@ typedef union _tuniHostIFkeyAttr {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFkeyAttr {
+struct key_attr {
tenuKeyType enuKeyType;
u8 u8KeyAction;
tuniHostIFkeyAttr uniHostIFkeyAttr;
-} tstrHostIFkeyAttr;
+};
@@ -422,7 +422,7 @@ union message_body {
struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
struct rcvd_net_info strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
- tstrHostIFkeyAttr strHostIFkeyAttr; /*!<>*/
+ struct key_attr strHostIFkeyAttr; /*!<>*/
tstrHostIFCfgParamAttr strHostIFCfgParamAttr;/*! */
tstrHostIFSetChan strHostIFSetChan;
tstrHostIFGetChan strHostIFGetChan;
@@ -2711,13 +2711,14 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv
*drvHandler,
/**
* @brief Handle_Key
* @details Sending config packet to firmware to set key
- * @param[in]tstrHostIFkeyAttr* pstrHostIFkeyAttr
+ * @param[in]struct key_attr *pstrHostIFkeyAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static int Handle_Key(tstrWILC_WFIDrv *drvHandler, tstrHostIFkeyAttr
*pstrHostIFkeyAttr)
+static int Handle_Key(tstrWILC_WFIDrv *drvHandler,
+ struct key_attr *pstrHostIFkeyAttr)
{
s32 s32Error = 0;
tstrWID strWID;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 12/34] staging: wilc1000: remove typedef from the struct tstrHostIFCfgParamAttr
This patch removes typedef from the struct tstrHostIFCfgParamAttr and
renames it to cfg_param_attr in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 1f0c842..d863a8c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -65,7 +65,7 @@ extern u8 g_wilc_initialized;
/*/
/*!
- * @struct tstrHostIFCfgParamAttr
+ * @struct cfg_param_attr
* @brief Structure to hold Host IF CFG Params Attributes
* @details
* @todo
@@ -74,10 +74,9 @@ extern u8 g_wilc_initialized;
* @date 02 April 2012
* @version 1.0
*/
-typedef struct _tstrHostIFCfgParamAttr {
+struct cfg_param_attr {
tstrCfgParamVal pstrCfgParamVal;
-
-} tstrHostIFCfgParamAttr;
+};
/*!
* @struct tstrHostIFwpaAttr
@@ -423,7 +422,7 @@ union message_body {
struct rcvd_net_info strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
struct key_attr strHostIFkeyAttr; /*!<>*/
- tstrHostIFCfgParamAttr strHostIFCfgParamAttr;/*! */
+ struct cfg_param_attr strHostIFCfgParamAttr;/*! */
tstrHostIFSetChan strHostIFSetChan;
tstrHostIFGetChan strHostIFGetChan;
tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon
message body */
@@ -925,13 +924,14 @@ static s32 Handle_GetMacAddress(tstrWILC_WFIDrv
*drvHandler, tstrHostIfGetMacAdd
/**
* @brief Handle_CfgParam
* @detailsSending config packet to firmware to set CFG params
- * @param[in] tstrHostIFCfgParamAttr* strHostIFCfgParamAttr
+ * @param[in] struct cfg_param_attr *strHostIFCfgParamAttr
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_CfgParam(tstrWILC_WFIDrv *drvHandler, tstrHostIFCfgParamAttr
*strHostIFCfgParamAttr)
+static s32 Handle_CfgParam(tstrWILC_WFIDrv *drvHandler,
+ struct cfg_param_attr *strHostIFCfgParamAttr)
{
s32 s32Error = 0;
tstrWID strWIDList[32];
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 16/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelBeacon
This patch removes typedef from the struct tstrHostIFDelBeacon and
renames it to del_beacon in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 06091da..8733c1b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -285,7 +285,7 @@ struct set_beacon {
/*!
- * @struct tstrHostIFDelBeacon
+ * @struct del_beacon
* @brief Del Beacon message body
* @details
* @todo
@@ -294,9 +294,9 @@ struct set_beacon {
* @date 15 July 2012
* @version 1.0
*/
-typedef struct _tstrHostIFDelBeacon {
+struct del_beacon {
u8 u8dummy;
-} tstrHostIFDelBeacon;
+};
/*!
* @struct tstrHostIFSetMulti
@@ -426,7 +426,7 @@ union message_body {
struct set_channel strHostIFSetChan;
struct get_channel strHostIFGetChan;
struct set_beacon strHostIFSetBeacon; /*!< Set beacon
message body */
- tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon
message body */
+ struct del_beacon strHostIFDelBeacon; /*!< Del beacon
message body */
tstrWILC_AddStaParam strAddStaParam;/*!< Add
station message body */
tstrHostIFDelSta strDelStaParam;/*!<
Del Station message body */
tstrWILC_AddStaParam strEditStaParam; /*!<
Edit station message body */
@@ -3523,13 +3523,14 @@ ERRORHANDLER:
/**
* @brief Handle_AddBeacon
* @details Sending config packet to delete beacon
- * @param[in] tstrHostIFDelBeacon* pstrDelBeacon
+ * @param[in] struct del_beacon *pstrDelBeacon
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler, tstrHostIFDelBeacon
*pstrDelBeacon)
+static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler,
+struct del_beacon *pstrDelBeacon)
{
s32 s32Error = 0;
tstrWID strWID;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 17/34] staging: wilc1000: remove typedef from the struct tstrWILC_AddStaParam
This patch removes typedef from the struct tstrWILC_AddStaParam and
renames it to add_sta_param in oder to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 37 +--
drivers/staging/wilc1000/host_interface.h | 16 ++
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +--
3 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 8733c1b..0308421 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -427,9 +427,9 @@ union message_body {
struct get_channel strHostIFGetChan;
struct set_beacon strHostIFSetBeacon; /*!< Set beacon
message body */
struct del_beacon strHostIFDelBeacon; /*!< Del beacon
message body */
- tstrWILC_AddStaParam strAddStaParam;/*!< Add
station message body */
+ struct add_sta_param strAddStaParam;/*!< Add
station message body */
tstrHostIFDelSta strDelStaParam;/*!<
Del Station message body */
- tstrWILC_AddStaParam strEditStaParam; /*!<
Edit station message body */
+ struct add_sta_param strEditStaParam; /*!<
Edit station message body */
/* tstrScanComplete strScanComplete;/
*Received Async. Scan Complete message body* / */
tstrTimerCb strTimerCb;
/*!< Timer callback message body */
tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management
message body */
@@ -3561,13 +3561,14 @@ static void Handle_DelBeacon(tstrWILC_WFIDrv
*drvHandler,
/**
* @brief WILC_HostIf_PackStaParam
* @details Handling packing of the station params in a buffer
- * @param[in] u8* pu8Buffer, tstrWILC_AddStaParam* pstrStationParam
+ * @param[in] u8* pu8Buffer, struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam
*pstrStationParam)
+static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
+ struct add_sta_param *pstrStationParam)
{
u8 *pu8CurrByte;
@@ -3615,13 +3616,14 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
tstrWILC_AddStaParam *pstrSta
/**
* @brief Handle_AddStation
* @details Sending config packet to add station
- * @param[in] tstrWILC_AddStaParam* pstrStationParam
+ * @param[in] struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler,
tstrWILC_AddStaParam *pstrStationParam)
+static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler,
+ struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -3750,13 +3752,14 @@ ERRORHANDLER:
/**
* @brief Handle_EditStation
* @detailsSending config packet to edit station
- * @param[in] tstrWILC_AddStaParam* pstrStationParam
+ * @param[in] struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler,
tstrWILC_AddStaParam *pstrStationParam)
+static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler,
+ struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7058,18 +7061,19 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
/**
* @brief host_int_add_station
* @details Setting add station params in message queue
- * @param[in]WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam*
pstrStaParams
+ * @param[in]WILC_WFIDrvHandle hWFIDrv, struct add_sta_param
*pstrStaParams
* @return Error code.
* @author
* @date
* @version 1.0
*/
-s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam
*pstrStaParams)
+s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
+struct add_sta_param *pstrStaParams)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam;
+ struct add_sta_param *pstrAddStationMsg = &msg.body.strAddStaParam;
if (pstrWFIDrv == NULL) {
@@ -7086,7 +7090,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
tstrWILC_AddStaParam *pstrSta
msg.id = HOST_IF_MSG_ADD_STATION;
msg.drvHandler = hWFIDrv;
- memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
+ memcpy(pstrAddStationMsg, pstrStaParams, sizeof(st
[PATCH 18/34] staging: wilc1000: remove typedef from the struct tstrTimerCb
This patch removes typedef from the tstrTimerCb and renames it to
timer_cb in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 0308421..5f546e5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -346,7 +346,7 @@ typedef struct {
} tstrHostIFDelSta;
/*!
- * @struct tstrTimerCb
+ * @struct timer_cb
* @brief Timer callback message body
* @details
* @todo
@@ -355,9 +355,9 @@ typedef struct {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrTimerCb {
+struct timer_cb {
void *pvUsrArg; /*!< Private data passed at timer start
*/
-} tstrTimerCb;
+};
/*!
* @struct tstrHostIfPowerMgmtParam
@@ -431,7 +431,7 @@ union message_body {
tstrHostIFDelSta strDelStaParam;/*!<
Del Station message body */
struct add_sta_param strEditStaParam; /*!<
Edit station message body */
/* tstrScanComplete strScanComplete;/
*Received Async. Scan Complete message body* / */
- tstrTimerCb strTimerCb;
/*!< Timer callback message body */
+ struct timer_cb strTimerCb;
/*!< Timer callback message body */
tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management
message body */
tstrHostIfStaInactiveT strHostIfStaInactiveT;
tstrHostIFSetIPAddr strHostIfSetIP;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 13/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetChan
This patch removes typedef from the struct tstrHostIFSetChan and ranames
it to set_channel in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index d863a8c..2f86a3b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -216,7 +216,7 @@ struct rcvd_async_info {
};
/*!
- * @struct tstrHostIFSetChan
+ * @struct set_channel
* @brief Set Channel message body
* @details
* @todo
@@ -225,9 +225,9 @@ struct rcvd_async_info {
* @date 25 March 2012
* @version 1.0
*/
-typedef struct _tstrHostIFSetChan {
+struct set_channel {
u8 u8SetChan;
-} tstrHostIFSetChan;
+};
/*!
* @struct tstrHostIFSetChan
@@ -423,7 +423,7 @@ union message_body {
struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
struct key_attr strHostIFkeyAttr; /*!<>*/
struct cfg_param_attr strHostIFCfgParamAttr;/*! */
- tstrHostIFSetChan strHostIFSetChan;
+ struct set_channel strHostIFSetChan;
tstrHostIFGetChan strHostIFGetChan;
tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon
message body */
tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon
message body */
@@ -635,13 +635,14 @@ static tstrWILC_WFIDrv *get_handler_from_id(int id)
/**
* @brief Handle_SetChannel
* @detailsSending config packet to firmware to set channel
- * @param[in] tstrHostIFSetChan* pstrHostIFSetChan
+ * @param[in] struct set_channel *pstrHostIFSetChan
* @return Error code.
* @author
* @date
* @version 1.0
*/
-static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler, tstrHostIFSetChan
*pstrHostIFSetChan)
+static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler,
+struct set_channel *pstrHostIFSetChan)
{
s32 s32Error = 0;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 15/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetBeacon
This patch removes typedef from the struct tstrHostIFSetBeacon and
renames it to set_beacon in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 58f138b..06091da 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -261,7 +261,7 @@ struct get_channel {
* } tstrScanComplete;*/
/*!
- * @struct tstrHostIFSetBeacon
+ * @struct set_beacon
* @brief Set Beacon message body
* @details
* @todo
@@ -270,7 +270,7 @@ struct get_channel {
* @date 10 July 2012
* @version 1.0
*/
-typedef struct _tstrHostIFSetBeacon {
+struct set_beacon {
u32 u32Interval;/*!< Beacon Interval. Period
between two successive beacons on air */
u32 u32DTIMPeriod; /*!< DTIM Period. Indicates how many
Beacon frames
* (including the current frame) appear
before the next DTIM*/
@@ -280,7 +280,7 @@ typedef struct _tstrHostIFSetBeacon {
u32 u32TailLen; /*!< Length of the tail buffer
in bytes */
u8 *pu8Tail;/*!< Pointer to the beacon's tail
buffer. Beacon's tail starts just
* after the TIM inormation element */
-} tstrHostIFSetBeacon;
+};
@@ -425,7 +425,7 @@ union message_body {
struct cfg_param_attr strHostIFCfgParamAttr;/*! */
struct set_channel strHostIFSetChan;
struct get_channel strHostIFGetChan;
- tstrHostIFSetBeacon strHostIFSetBeacon; /*!< Set beacon
message body */
+ struct set_beacon strHostIFSetBeacon; /*!< Set beacon
message body */
tstrHostIFDelBeacon strHostIFDelBeacon; /*!< Del beacon
message body */
tstrWILC_AddStaParam strAddStaParam;/*!< Add
station message body */
tstrHostIFDelSta strDelStaParam;/*!<
Del Station message body */
@@ -3453,13 +3453,14 @@ static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv
*drvHandler, tstrHostIfStaIna
/**
* @brief Handle_AddBeacon
* @details Sending config packet to add beacon
- * @param[in]tstrHostIFSetBeacon* pstrSetBeaconParam
+ * @param[in]struct set_beacon *pstrSetBeaconParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler, tstrHostIFSetBeacon
*pstrSetBeaconParam)
+static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler,
+struct set_beacon *pstrSetBeaconParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -6964,7 +6965,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32
u32Interval,
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFSetBeacon *pstrSetBeaconParam = &msg.body.strHostIFSetBeacon;
+ struct set_beacon *pstrSetBeaconParam = &msg.body.strHostIFSetBeacon;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 27/34] staging: wilc1000: remove typedef from the struct tstrHostIfBASessionInfo
This patch removes typedef from the struct tstrHostIfBASessionInfo and
renames it to ba_session_info in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 17 ++---
drivers/staging/wilc1000/host_interface.h | 5 ++---
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 86fce58..163f78e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -438,7 +438,7 @@ union message_body {
struct op_mode strHostIfSetOperationMode;
struct set_mac_addr strHostIfSetMacAddress;
struct get_mac_addr strHostIfGetMacAddress;
- tstrHostIfBASessionInfo strHostIfBASessionInfo;
+ struct ba_session_info strHostIfBASessionInfo;
tstrHostIfRemainOnChan strHostIfRemainOnChan;
tstrHostIfRegisterFrame strHostIfRegisterFrame;
char *pUserData;
@@ -4111,7 +4111,8 @@ ERRORHANDLER:
* @date Feb. 2014
* @version 9.0
*/
-static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler,
tstrHostIfBASessionInfo *strHostIfBASessionInfo)
+static s32 Handle_AddBASession(tstrWILC_WFIDrv *drvHandler,
+ struct ba_session_info *strHostIfBASessionInfo)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -4201,7 +4202,8 @@ static s32 Handle_AddBASession(tstrWILC_WFIDrv
*drvHandler, tstrHostIfBASessionI
* @date Feb. 2013
* @version 9.0
*/
-static s32 Handle_DelBASession(tstrWILC_WFIDrv *drvHandler,
tstrHostIfBASessionInfo *strHostIfBASessionInfo)
+static s32 Handle_DelBASession(tstrWILC_WFIDrv *drvHandler,
+ struct ba_session_info *strHostIfBASessionInfo)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -4273,7 +4275,8 @@ static s32 Handle_DelBASession(tstrWILC_WFIDrv
*drvHandler, tstrHostIfBASessionI
* @date Feb. 2013
* @version 9.0
*/
-static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler,
tstrHostIfBASessionInfo *strHostIfBASessionInfo)
+static s32 Handle_DelAllRxBASessions(tstrWILC_WFIDrv *drvHandler,
+struct ba_session_info
*strHostIfBASessionInfo)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7572,7 +7575,7 @@ static int host_int_addBASession(tstrWILC_WFIDrv
*hWFIDrv, char *pBSSID, char TI
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo =
&msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo =
&msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7603,7 +7606,7 @@ s32 host_int_delBASession(tstrWILC_WFIDrv *hWFIDrv, char
*pBSSID, char TID)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo =
&msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo =
&msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7634,7 +7637,7 @@ s32 host_int_del_All_Rx_BASession(tstrWILC_WFIDrv
*hWFIDrv, char *pBSSID, char T
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfBASessionInfo *pBASessionInfo =
&msg.body.strHostIfBASessionInfo;
+ struct ba_session_info *pBASessionInfo =
&msg.body.strHostIfBASessionInfo;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index d257183..9a1d3599 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -272,13 +272,12 @@ struct get_mac_addr {
u8 *u8MacAddress;
};
-/*BugID_5222*/
-typedef struct {
+struct ba_session_info {
u8 au8Bssid[ETH_ALEN];
u8 u8Ted;
u16 u16BufferSize;
u16 u16SessionTimeout;
-} tstrHostIfBASessionInfo;
+};
typedef struct {
u16 u16Channel;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 25/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetMacAddress
This patch removes typedef from the struct tstrHostIfSetMacAddress and
renames it set_mac_addr in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 1433417..756555d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -436,7 +436,7 @@ union message_body {
struct drv_handler strHostIfSetDrvHandler;
struct set_multicast strHostIfSetMulti;
struct op_mode strHostIfSetOperationMode;
- tstrHostIfSetMacAddress strHostIfSetMacAddress;
+ struct set_mac_addr strHostIfSetMacAddress;
tstrHostIfGetMacAddress strHostIfGetMacAddress;
tstrHostIfBASessionInfo strHostIfBASessionInfo;
tstrHostIfRemainOnChan strHostIfRemainOnChan;
@@ -854,7 +854,8 @@ s32 Handle_get_IPAddress(tstrWILC_WFIDrv *drvHandler, u8
*pu8IPAddr, u8 idx)
* @date November 2013
* @version 7.0
*/
-static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler,
tstrHostIfSetMacAddress *pstrHostIfSetMacAddress)
+static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler,
+ struct set_mac_addr *pstrHostIfSetMacAddress)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 078bb54..5ca7734 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -264,10 +264,9 @@ struct op_mode {
u32 u32Mode;
};
-/*BugID_5077*/
-typedef struct {
+struct set_mac_addr {
u8 u8MacAddress[ETH_ALEN];
-} tstrHostIfSetMacAddress;
+};
/*BugID_5213*/
typedef struct {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 22/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetDrvHandler
This patch removes typedef from the struct tstrHostIfSetDrvHandler and
renames it to drv_handler in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 7 ---
drivers/staging/wilc1000/host_interface.h | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 8b995c3..80527b5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -433,7 +433,7 @@ union message_body {
struct power_mgmt_param strPowerMgmtparam; /*!< Power Management
message body */
struct sta_inactive_t strHostIfStaInactiveT;
struct set_ip_addr strHostIfSetIP;
- tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
+ struct drv_handler strHostIfSetDrvHandler;
tstrHostIFSetMulti strHostIfSetMulti;
tstrHostIfSetOperationMode strHostIfSetOperationMode;
tstrHostIfSetMacAddress strHostIfSetMacAddress;
@@ -667,14 +667,15 @@ static s32 Handle_SetChannel(tstrWILC_WFIDrv *drvHandler,
/**
* @brief Handle_SetWfiDrvHandler
* @detailsSending config packet to firmware to set driver handler
- * @param[in] void * drvHandler,tstrHostIfSetDrvHandler*
pstrHostIfSetDrvHandler
+ * @param[in] void * drvHandler,
+ * struct drv_handler *pstrHostIfSetDrvHandler
* @return Error code.
* @author
* @date
* @version 1.0
*/
static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv *drvHandler,
- tstrHostIfSetDrvHandler
*pstrHostIfSetDrvHandler)
+ struct drv_handler *pstrHostIfSetDrvHandler)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 90493c6..a023365 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -256,9 +256,9 @@ typedef struct {
void *u32UserConnectPvoid;
} tstrWILC_UsrConnReq;
-typedef struct {
+struct drv_handler {
u32 u32Address;
-} tstrHostIfSetDrvHandler;
+};
typedef struct {
u32 u32Mode;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 26/34] staging: wilc1000: remove typedef from the struct tstrHostIfGetMacAddress
This patch removes typedef from the struct tstrHostIfGetMacAddress and
renames it get_mac_addr in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 5 ++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 756555d..86fce58 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -437,7 +437,7 @@ union message_body {
struct set_multicast strHostIfSetMulti;
struct op_mode strHostIfSetOperationMode;
struct set_mac_addr strHostIfSetMacAddress;
- tstrHostIfGetMacAddress strHostIfGetMacAddress;
+ struct get_mac_addr strHostIfGetMacAddress;
tstrHostIfBASessionInfo strHostIfBASessionInfo;
tstrHostIfRemainOnChan strHostIfRemainOnChan;
tstrHostIfRegisterFrame strHostIfRegisterFrame;
@@ -898,7 +898,8 @@ static s32 Handle_SetMacAddress(tstrWILC_WFIDrv *drvHandler,
* @date JAN 2013
* @version 8.0
*/
-static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler,
tstrHostIfGetMacAddress *pstrHostIfGetMacAddress)
+static s32 Handle_GetMacAddress(tstrWILC_WFIDrv *drvHandler,
+ struct get_mac_addr *pstrHostIfGetMacAddress)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 5ca7734..d257183 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -268,10 +268,9 @@ struct set_mac_addr {
u8 u8MacAddress[ETH_ALEN];
};
-/*BugID_5213*/
-typedef struct {
+struct get_mac_addr {
u8 *u8MacAddress;
-} tstrHostIfGetMacAddress;
+};
/*BugID_5222*/
typedef struct {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 24/34] staging: wilc1000: remove typedef from the struct tstrHostIfSetOperationMode
This patch removes typedef from the struct tstrHostIfSetOperationMode
and renames it to op_mode in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index c484619..1433417 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -435,7 +435,7 @@ union message_body {
struct set_ip_addr strHostIfSetIP;
struct drv_handler strHostIfSetDrvHandler;
struct set_multicast strHostIfSetMulti;
- tstrHostIfSetOperationMode strHostIfSetOperationMode;
+ struct op_mode strHostIfSetOperationMode;
tstrHostIfSetMacAddress strHostIfSetMacAddress;
tstrHostIfGetMacAddress strHostIfGetMacAddress;
tstrHostIfBASessionInfo strHostIfBASessionInfo;
@@ -715,7 +715,8 @@ static s32 Handle_SetWfiDrvHandler(tstrWILC_WFIDrv
*drvHandler,
* @date
* @version 1.0
*/
-static s32 Handle_SetOperationMode(tstrWILC_WFIDrv *drvHandler,
tstrHostIfSetOperationMode *pstrHostIfSetOperationMode)
+static s32 Handle_SetOperationMode(tstrWILC_WFIDrv *drvHandler,
+ struct op_mode *pstrHostIfSetOperationMode)
{
s32 s32Error = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index a023365..078bb54 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -260,9 +260,9 @@ struct drv_handler {
u32 u32Address;
};
-typedef struct {
+struct op_mode {
u32 u32Mode;
-} tstrHostIfSetOperationMode;
+};
/*BugID_5077*/
typedef struct {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 23/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetMulti
This patch removes typedef from the struct tstrHostIFSetMulti and
renames it to set_multicast in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 80527b5..c484619 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -299,7 +299,7 @@ struct del_beacon {
};
/*!
- * @struct tstrHostIFSetMulti
+ * @struct set_multicast
* @brief set Multicast filter Address
* @details
* @todo
@@ -309,10 +309,10 @@ struct del_beacon {
* @version 1.0 Description
*/
-typedef struct {
+struct set_multicast {
bool bIsEnabled;
u32 u32count;
-} tstrHostIFSetMulti;
+};
/*!
* @struct tstrHostIFDelAllSta
@@ -434,7 +434,7 @@ union message_body {
struct sta_inactive_t strHostIfStaInactiveT;
struct set_ip_addr strHostIfSetIP;
struct drv_handler strHostIfSetDrvHandler;
- tstrHostIFSetMulti strHostIfSetMulti;
+ struct set_multicast strHostIfSetMulti;
tstrHostIfSetOperationMode strHostIfSetOperationMode;
tstrHostIfSetMacAddress strHostIfSetMacAddress;
tstrHostIfGetMacAddress strHostIfGetMacAddress;
@@ -4050,13 +4050,14 @@ static void Handle_PowerManagement(tstrWILC_WFIDrv
*drvHandler,
/**
* @brief Handle_SetMulticastFilter
* @detailsSet Multicast filter in firmware
- * @param[in] tstrHostIFSetMulti* strHostIfSetMulti
+ * @param[in] struct set_multicast *strHostIfSetMulti
* @return NONE
* @authorasobhy
* @date
* @version 1.0
*/
-static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler,
tstrHostIFSetMulti *strHostIfSetMulti)
+static void Handle_SetMulticastFilter(tstrWILC_WFIDrv *drvHandler,
+ struct set_multicast *strHostIfSetMulti)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -4066,7 +4067,7 @@ static void Handle_SetMulticastFilter(tstrWILC_WFIDrv
*drvHandler, tstrHostIFSet
strWID.u16WIDid = (u16)WID_SETUP_MULTICAST_FILTER;
strWID.enuWIDtype = WID_BIN;
- strWID.s32ValueSize = sizeof(tstrHostIFSetMulti) +
((strHostIfSetMulti->u32count) * ETH_ALEN);
+ strWID.s32ValueSize = sizeof(struct set_multicast) +
((strHostIfSetMulti->u32count) * ETH_ALEN);
strWID.ps8WidVal = kmalloc(strWID.s32ValueSize, GFP_KERNEL);
if (strWID.ps8WidVal == NULL)
goto ERRORHANDLER;
@@ -7301,7 +7302,7 @@ s32 host_int_setup_multicast_filter(tstrWILC_WFIDrv
*hWFIDrv, bool bIsEnabled, u
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFSetMulti *pstrMulticastFilterParam =
&msg.body.strHostIfSetMulti;
+ struct set_multicast *pstrMulticastFilterParam =
&msg.body.strHostIfSetMulti;
if (pstrWFIDrv == NULL) {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 20/34] staging: wilc1000: remove typedef from the struct tstrHostIfStaInactiveT
This patch removes typedef from the struct tstrHostIfStaInactiveT and
renames it to sta_inactive_t in oder to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 12adb03..8fc9186 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -392,7 +392,7 @@ typedef struct {
} tstrHostIFSetIPAddr;
/*!
- * @struct tstrHostIfStaInactiveT
+ * @struct sta_inactive_t
* @brief Get station message body
* @details
* @todo
@@ -401,10 +401,9 @@ typedef struct {
* @date 16 April 2013
* @version 1.0
*/
-typedef struct {
+struct sta_inactive_t {
u8 mac[6];
-
-} tstrHostIfStaInactiveT;
+};
/**/
/*!
* @union message_body
@@ -433,7 +432,7 @@ union message_body {
/* tstrScanComplete strScanComplete;/
*Received Async. Scan Complete message body* / */
struct timer_cb strTimerCb;
/*!< Timer callback message body */
struct power_mgmt_param strPowerMgmtparam; /*!< Power Management
message body */
- tstrHostIfStaInactiveT strHostIfStaInactiveT;
+ struct sta_inactive_t strHostIfStaInactiveT;
tstrHostIFSetIPAddr strHostIfSetIP;
tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
tstrHostIFSetMulti strHostIfSetMulti;
@@ -3393,7 +3392,8 @@ s32 Handle_GetStatistics(tstrWILC_WFIDrv *drvHandler,
tstrStatistics *pstrStatis
* @date
* @version 1.0
*/
-static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler,
tstrHostIfStaInactiveT *strHostIfStaInactiveT)
+static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler,
+ struct sta_inactive_t *strHostIfStaInactiveT)
{
s32 s32Error = 0;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 21/34] staging: wilc1000: remove typedef from the struct tstrHostIFSetIPAddr
This patch removes typedef from the struct tstrHostIFSetIPAddr and
renames it to set_ip_addr in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 8fc9186..8b995c3 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -376,7 +376,7 @@ struct power_mgmt_param {
};
/*!
- * @struct tstrHostIFSetIPAddr
+ * @struct set_ip_addr
* @brief set IP Address message body
* @details
* @todo
@@ -385,11 +385,10 @@ struct power_mgmt_param {
* @date 30 August 2013
* @version 1.0 Description
*/
-
-typedef struct {
+struct set_ip_addr {
u8 *au8IPAddr;
u8 idx;
-} tstrHostIFSetIPAddr;
+};
/*!
* @struct sta_inactive_t
@@ -433,7 +432,7 @@ union message_body {
struct timer_cb strTimerCb;
/*!< Timer callback message body */
struct power_mgmt_param strPowerMgmtparam; /*!< Power Management
message body */
struct sta_inactive_t strHostIfStaInactiveT;
- tstrHostIFSetIPAddr strHostIfSetIP;
+ struct set_ip_addr strHostIfSetIP;
tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
tstrHostIFSetMulti strHostIfSetMulti;
tstrHostIfSetOperationMode strHostIfSetOperationMode;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 19/34] staging: wilc1000: remove typedef from the struct tstrHostIfPowerMgmtParam
This patch removes typedef from the struct tstrHostIfPowerMgmtParam and
renames it to power_mgmt_param in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 5f546e5..12adb03 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -360,7 +360,7 @@ struct timer_cb {
};
/*!
- * @struct tstrHostIfPowerMgmtParam
+ * @struct power_mgmt_param
* @brief Power management message body
* @details
* @todo
@@ -369,11 +369,11 @@ struct timer_cb {
* @date 24 November 2012
* @version 1.0
*/
-typedef struct {
+struct power_mgmt_param {
bool bIsEnabled;
u32 u32Timeout;
-} tstrHostIfPowerMgmtParam;
+};
/*!
* @struct tstrHostIFSetIPAddr
@@ -432,7 +432,7 @@ union message_body {
struct add_sta_param strEditStaParam; /*!<
Edit station message body */
/* tstrScanComplete strScanComplete;/
*Received Async. Scan Complete message body* / */
struct timer_cb strTimerCb;
/*!< Timer callback message body */
- tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management
message body */
+ struct power_mgmt_param strPowerMgmtparam; /*!< Power Management
message body */
tstrHostIfStaInactiveT strHostIfStaInactiveT;
tstrHostIFSetIPAddr strHostIfSetIP;
tstrHostIfSetDrvHandler strHostIfSetDrvHandler;
@@ -4020,7 +4020,8 @@ static void ListenTimerCB(unsigned long arg)
* @date
* @version 1.0
*/
-static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler,
tstrHostIfPowerMgmtParam *strPowerMgmtParam)
+static void Handle_PowerManagement(tstrWILC_WFIDrv *drvHandler,
+ struct power_mgmt_param *strPowerMgmtParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7266,7 +7267,7 @@ s32 host_int_set_power_mgmt(tstrWILC_WFIDrv *hWFIDrv,
bool bIsEnabled, u32 u32Ti
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIfPowerMgmtParam *pstrPowerMgmtParam =
&msg.body.strPowerMgmtparam;
+ struct power_mgmt_param *pstrPowerMgmtParam =
&msg.body.strPowerMgmtparam;
PRINT_INFO(HOSTINF_DBG, "\n\n>> Setting PS to %d <<\n\n", bIsEnabled);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 28/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelSta
This patch removes typedef from the struct tstrHostIFDelSta and renames
it del_sta in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 163f78e..8894f90 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -331,7 +331,7 @@ typedef struct {
} tstrHostIFDelAllSta;
/*!
- * @struct tstrHostIFDelSta
+ * @struct del_sta
* @brief Delete station message body
* @details
* @todo
@@ -340,10 +340,9 @@ typedef struct {
* @date 15 July 2012
* @version 1.0 Description
*/
-
-typedef struct {
+struct del_sta {
u8 au8MacAddr[ETH_ALEN];
-} tstrHostIFDelSta;
+};
/*!
* @struct timer_cb
@@ -426,7 +425,7 @@ union message_body {
struct set_beacon strHostIFSetBeacon; /*!< Set beacon
message body */
struct del_beacon strHostIFDelBeacon; /*!< Del beacon
message body */
struct add_sta_param strAddStaParam;/*!< Add
station message body */
- tstrHostIFDelSta strDelStaParam;/*!<
Del Station message body */
+ struct del_sta strDelStaParam;/*!< Del
Station message body */
struct add_sta_param strEditStaParam; /*!<
Edit station message body */
/* tstrScanComplete strScanComplete;/
*Received Async. Scan Complete message body* / */
struct timer_cb strTimerCb;
/*!< Timer callback message body */
@@ -3714,13 +3713,14 @@ ERRORHANDLER:
/**
* @brief Handle_DelStation
* @detailsSending config packet to delete station
- * @param[in] tstrHostIFDelSta* pstrDelStaParam
+ * @param[in] struct del_sta *pstrDelStaParam
* @return NONE
* @author
* @date
* @version 1.0
*/
-static void Handle_DelStation(tstrWILC_WFIDrv *drvHandler, tstrHostIFDelSta
*pstrDelStaParam)
+static void Handle_DelStation(tstrWILC_WFIDrv *drvHandler,
+ struct del_sta *pstrDelStaParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7130,7 +7130,7 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const
u8 *pu8MacAddr)
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFDelSta *pstrDelStationMsg = &msg.body.strDelStaParam;
+ struct del_sta *pstrDelStationMsg = &msg.body.strDelStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 29/34] staging: wilc1000: remove typedef from the struct tstrHostIfRemainOnChan
This patch removes typedef from the struct tstrHostIfRemainOnChan and
renames it to remain_ch in order to comply with the Linux coding style
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 8 +---
drivers/staging/wilc1000/host_interface.h | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 8894f90..59b2308 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -438,7 +438,7 @@ union message_body {
struct set_mac_addr strHostIfSetMacAddress;
struct get_mac_addr strHostIfGetMacAddress;
struct ba_session_info strHostIfBASessionInfo;
- tstrHostIfRemainOnChan strHostIfRemainOnChan;
+ struct remain_ch strHostIfRemainOnChan;
tstrHostIfRegisterFrame strHostIfRegisterFrame;
char *pUserData;
tstrHostIFDelAllSta strHostIFDelAllSta;
@@ -3801,7 +3801,8 @@ ERRORHANDLER:
* @date
* @version 1.0
*/
-static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler,
tstrHostIfRemainOnChan *pstrHostIfRemainOnChan)
+static int Handle_RemainOnChan(tstrWILC_WFIDrv *drvHandler,
+ struct remain_ch *pstrHostIfRemainOnChan)
{
s32 s32Error = 0;
u8 u8remain_on_chan_flag;
@@ -3937,7 +3938,8 @@ static int Handle_RegisterFrame(tstrWILC_WFIDrv
*drvHandler, tstrHostIfRegisterF
* @version 1.0
*/
#define FALSE_FRMWR_CHANNEL 100
-static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler,
tstrHostIfRemainOnChan *pstrHostIfRemainOnChan)
+static u32 Handle_ListenStateExpired(tstrWILC_WFIDrv *drvHandler,
+struct remain_ch *pstrHostIfRemainOnChan)
{
u8 u8remain_on_chan_flag;
tstrWID strWID;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 9a1d3599..59f83f5 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -279,14 +279,14 @@ struct ba_session_info {
u16 u16SessionTimeout;
};
-typedef struct {
+struct remain_ch {
u16 u16Channel;
u32 u32duration;
tWILCpfRemainOnChanExpired pRemainOnChanExpired;
tWILCpfRemainOnChanReady pRemainOnChanReady;
void *pVoid;
u32 u32ListenSessionID;
-} tstrHostIfRemainOnChan;
+};
typedef struct {
@@ -319,7 +319,7 @@ typedef struct {
tstrWILC_UsrConnReq strWILC_UsrConnReq;
/*Remain on channel struvture*/
- tstrHostIfRemainOnChan strHostIfRemainOnChan;
+ struct remain_ch strHostIfRemainOnChan;
u8 u8RemainOnChan_pendingreq;
u64 u64P2p_MgmtTimeout;
u8 u8P2PConnect;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 30/34] staging: wilc1000: remove typedef from the struct tstrHostIfRegisterFrame
This patch removes typedef from the struct tstrHostIfRegisterFrame and
renames it to reg_frame in order to comply with the Linux coding style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 5 +++--
drivers/staging/wilc1000/host_interface.h | 7 ++-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 59b2308..ce4384c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -439,7 +439,7 @@ union message_body {
struct get_mac_addr strHostIfGetMacAddress;
struct ba_session_info strHostIfBASessionInfo;
struct remain_ch strHostIfRemainOnChan;
- tstrHostIfRegisterFrame strHostIfRegisterFrame;
+ struct reg_frame strHostIfRegisterFrame;
char *pUserData;
tstrHostIFDelAllSta strHostIFDelAllSta;
};
@@ -3890,7 +3890,8 @@ ERRORHANDLER:
* @date
* @version 1.0
*/
-static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler,
tstrHostIfRegisterFrame *pstrHostIfRegisterFrame)
+static int Handle_RegisterFrame(tstrWILC_WFIDrv *drvHandler,
+ struct reg_frame *pstrHostIfRegisterFrame)
{
s32 s32Error = 0;
tstrWID strWID;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 59f83f5..1da1d2d 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -288,14 +288,11 @@ struct remain_ch {
u32 u32ListenSessionID;
};
-typedef struct {
-
+struct reg_frame {
bool bReg;
u16 u16FrameType;
u8 u8Regid;
-
-
-} tstrHostIfRegisterFrame;
+};
#define ACTION 0xD0
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 33/34] staging: wilc1000: remove u32Intialized which is unnecessary
This patch removes the global variable, u32Intialized which is not
necessary from the host_interface.c file.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 15 ---
1 file changed, 15 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 1be1a9c..c87bf13 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -6393,7 +6393,6 @@ void host_int_send_network_info_to_host
* @date 8 March 2012
* @version 1.0
*/
-static u32 u32Intialized;
static u32 clients_count;
s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
@@ -6402,12 +6401,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
tstrWILC_WFIDrv *pstrWFIDrv;
int err;
- /*if(u32Intialized == 1)
-* {
-* PRINT_D(HOSTINF_DBG,"Host interface is previously
initialized\n");
-* *phWFIDrv = (WILC_WFIDrvHandle)gWFiDrvHandle; //Will be adjusted
later for P2P
-* return 0;
-* }*/
PRINT_D(HOSTINF_DBG, "Initializing host interface for client %d\n",
clients_count + 1);
gbScanWhileConnected = false;
@@ -6519,7 +6512,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
goto _fail_mem_;
}
- u32Intialized = 1;
clients_count++; /* increase number of created entities */
return s32Error;
@@ -6559,12 +6551,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
/*obtain driver handle*/
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
- /*if(u32Intialized == 0)
-* {
-* PRINT_ER("Host Interface is not initialized\n");
-* return 0;
-* }*/
-
/*BugID_5348*/
if (pstrWFIDrv == NULL) {
@@ -6640,7 +6626,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
down(&(pstrWFIDrv->gtOsCfgValuesSem));
/*Setting the gloabl driver handler with NULL*/
- u32Intialized = 0;
/* gWFiDrvHandle = NULL; */
ret = remove_handler_in_list(pstrWFIDrv);
if (ret)
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 34/34] staging: wilc1000: delete unnecessary comments and dead code
The comments in union message_body are not essential and cross 80 ending
line, so they are deleted and also a dead code commented out in the union
is deleted.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 27 +--
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index c87bf13..50cd649 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -413,22 +413,21 @@ struct sta_inactive_t {
* @version 1.0
*/
union message_body {
- struct scan_attr strHostIFscanAttr; /*!< Host
IF Scan Request Attributes message body */
- struct connect_attr strHostIFconnectAttr; /*!< Host IF Connect
Request Attributes message body */
- struct rcvd_net_info strRcvdNetworkInfo; /*!< Received
Asynchronous Network Info message body */
- struct rcvd_async_info strRcvdGnrlAsyncInfo; /*!< Received General
Asynchronous Info message body */
- struct key_attr strHostIFkeyAttr; /*!<>*/
- struct cfg_param_attr strHostIFCfgParamAttr;/*! */
+ struct scan_attr strHostIFscanAttr;
+ struct connect_attr strHostIFconnectAttr;
+ struct rcvd_net_info strRcvdNetworkInfo;
+ struct rcvd_async_info strRcvdGnrlAsyncInfo;
+ struct key_attr strHostIFkeyAttr;
+ struct cfg_param_attr strHostIFCfgParamAttr;
struct set_channel strHostIFSetChan;
struct get_channel strHostIFGetChan;
- struct set_beacon strHostIFSetBeacon; /*!< Set beacon
message body */
- struct del_beacon strHostIFDelBeacon; /*!< Del beacon
message body */
- struct add_sta_param strAddStaParam;/*!< Add
station message body */
- struct del_sta strDelStaParam;/*!< Del
Station message body */
- struct add_sta_param strEditStaParam; /*!<
Edit station message body */
- /* tstrScanComplete strScanComplete;/
*Received Async. Scan Complete message body* / */
- struct timer_cb strTimerCb;
/*!< Timer callback message body */
- struct power_mgmt_param strPowerMgmtparam; /*!< Power Management
message body */
+ struct set_beacon strHostIFSetBeacon;
+ struct del_beacon strHostIFDelBeacon;
+ struct add_sta_param strAddStaParam;
+ struct del_sta strDelStaParam;
+ struct add_sta_param strEditStaParam;
+ struct timer_cb strTimerCb;
+ struct power_mgmt_param strPowerMgmtparam;
struct sta_inactive_t strHostIfStaInactiveT;
struct set_ip_addr strHostIfSetIP;
struct drv_handler strHostIfSetDrvHandler;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 32/34] staging: wilc1000: remove unnecessary global variable
The global variable msgQ_created is removed because it is not necessary.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 5d72246..1be1a9c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -6394,7 +6394,6 @@ void host_int_send_network_info_to_host
* @version 1.0
*/
static u32 u32Intialized;
-static u32 msgQ_created;
static u32 clients_count;
s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
@@ -6468,7 +6467,6 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv)
PRINT_ER("Failed to creat MQ\n");
goto _fail_;
}
- msgQ_created = 1;
HostIFthreadHandler = kthread_run(hostIFthread, NULL,
"WILC_kthread");
if (IS_ERR(HostIFthreadHandler)) {
PRINT_ER("Failed to creat Thread\n");
@@ -6637,7 +6635,6 @@ s32 host_int_deinit(tstrWILC_WFIDrv *hWFIDrv)
down(&hSemHostIFthrdEnd);
wilc_mq_destroy(&gMsgQHostIF);
- msgQ_created = 0;
}
down(&(pstrWFIDrv->gtOsCfgValuesSem));
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 31/34] staging: wilc1000: remove typedef from the struct tstrHostIFDelAllSta
This patch removes typedef from the struct tstrHostIFDelAllSta and
renames it to del_all_sta in order to comply with the Linux coding
style.
Signed-off-by: Tony Cho
---
drivers/staging/wilc1000/host_interface.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index ce4384c..5d72246 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -315,7 +315,7 @@ struct set_multicast {
};
/*!
- * @struct tstrHostIFDelAllSta
+ * @struct del_all_sta
* @brief Deauth station message body
* @details
* @todo
@@ -324,11 +324,10 @@ struct set_multicast {
* @date 09 April 2014
* @version 1.0 Description
*/
-
-typedef struct {
+struct del_all_sta {
u8 au8Sta_DelAllSta[MAX_NUM_STA][ETH_ALEN];
u8 u8Num_AssocSta;
-} tstrHostIFDelAllSta;
+};
/*!
* @struct del_sta
@@ -441,7 +440,7 @@ union message_body {
struct remain_ch strHostIfRemainOnChan;
struct reg_frame strHostIfRegisterFrame;
char *pUserData;
- tstrHostIFDelAllSta strHostIFDelAllSta;
+ struct del_all_sta strHostIFDelAllSta;
};
/*!
@@ -3664,7 +3663,8 @@ ERRORHANDLER:
* @date
* @version 1.0
*/
-static void Handle_DelAllSta(tstrWILC_WFIDrv *drvHandler, tstrHostIFDelAllSta
*pstrDelAllStaParam)
+static void Handle_DelAllSta(tstrWILC_WFIDrv *drvHandler,
+struct del_all_sta *pstrDelAllStaParam)
{
s32 s32Error = 0;
@@ -7175,7 +7175,7 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8
pu8MacAddr[][ETH_ALEN])
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
- tstrHostIFDelAllSta *pstrDelAllStationMsg =
&msg.body.strHostIFDelAllSta;
+ struct del_all_sta *pstrDelAllStationMsg = &msg.body.strHostIFDelAllSta;
u8 au8Zero_Buff[ETH_ALEN] = {0};
u32 i;
u8 u8AssocNumb = 0;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [RESEND 1/4] vme: move tsi148 error handling into VME subsystem
On 18/09/15 00:01, dmitry.kalin...@gmail.com wrote:
From: Dmitry Kalinkin
Error handling code found in tsi148 is not device specific. In fact it
already relies on shared vme_bus_error struct and vme_bridge.vme_errors
field. The other bridge driver could reuse this code if it is shared.
This introduces a slight behavior change: vme error message won't be
triggered in a rare case when err_chk=1 and kmalloc fails.
Signed-off-by: Dmitry Kalinkin
Cc: Igor Alekseev
Acked-by: Martyn Welch
---
drivers/vme/bridges/vme_tsi148.c | 93 +++---
drivers/vme/vme.c| 86 +++
drivers/vme/vme_bridge.h |6 +++
3 files changed, 99 insertions(+), 86 deletions(-)
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
index fb1e7ad..c1f9385 100644
--- a/drivers/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -169,7 +169,6 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge
*tsi148_bridge)
unsigned int error_addr_high, error_addr_low;
unsigned long long error_addr;
u32 error_attrib;
- struct vme_bus_error *error = NULL;
struct tsi148_driver *bridge;
bridge = tsi148_bridge->driver_priv;
@@ -186,23 +185,12 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge
*tsi148_bridge)
"Occurred\n");
}
- if (err_chk) {
- error = kmalloc(sizeof(struct vme_bus_error), GFP_ATOMIC);
- if (error) {
- error->address = error_addr;
- error->attributes = error_attrib;
- list_add_tail(&error->list, &tsi148_bridge->vme_errors);
- } else {
- dev_err(tsi148_bridge->parent,
- "Unable to alloc memory for VMEbus Error
reporting\n");
- }
- }
-
- if (!error) {
+ if (err_chk)
+ vme_bus_error_handler(tsi148_bridge, error_addr, error_attrib);
+ else
dev_err(tsi148_bridge->parent,
"VME Bus Error at address: 0x%llx, attributes: %08x\n",
error_addr, error_attrib);
- }
/* Clear Status */
iowrite32be(TSI148_LCSR_VEAT_VESCL, bridge->base + TSI148_LCSR_VEAT);
@@ -483,73 +471,6 @@ static int tsi148_irq_generate(struct vme_bridge
*tsi148_bridge, int level,
}
/*
- * Find the first error in this address range
- */
-static struct vme_bus_error *tsi148_find_error(struct vme_bridge
*tsi148_bridge,
- u32 aspace, unsigned long long address, size_t count)
-{
- struct list_head *err_pos;
- struct vme_bus_error *vme_err, *valid = NULL;
- unsigned long long bound;
-
- bound = address + count;
-
- /*
-* XXX We are currently not looking at the address space when parsing
-* for errors. This is because parsing the Address Modifier Codes
-* is going to be quite resource intensive to do properly. We
-* should be OK just looking at the addresses and this is certainly
-* much better than what we had before.
-*/
- err_pos = NULL;
- /* Iterate through errors */
- list_for_each(err_pos, &tsi148_bridge->vme_errors) {
- vme_err = list_entry(err_pos, struct vme_bus_error, list);
- if ((vme_err->address >= address) &&
- (vme_err->address < bound)) {
-
- valid = vme_err;
- break;
- }
- }
-
- return valid;
-}
-
-/*
- * Clear errors in the provided address range.
- */
-static void tsi148_clear_errors(struct vme_bridge *tsi148_bridge,
- u32 aspace, unsigned long long address, size_t count)
-{
- struct list_head *err_pos, *temp;
- struct vme_bus_error *vme_err;
- unsigned long long bound;
-
- bound = address + count;
-
- /*
-* XXX We are currently not looking at the address space when parsing
-* for errors. This is because parsing the Address Modifier Codes
-* is going to be quite resource intensive to do properly. We
-* should be OK just looking at the addresses and this is certainly
-* much better than what we had before.
-*/
- err_pos = NULL;
- /* Iterate through errors */
- list_for_each_safe(err_pos, temp, &tsi148_bridge->vme_errors) {
- vme_err = list_entry(err_pos, struct vme_bus_error, list);
-
- if ((vme_err->address >= address) &&
- (vme_err->address < bound)) {
-
- list_del(err_pos);
- kfree(vme_err);
- }
- }
-}
-
-/*
* Initialize a slave window with the requested attributes.
*/
static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
@@ -1323,14 +1244,14 @@ out:
Re: [RESEND 2/4] vme: include address space in error filtering
On 18/09/15 00:01, dmitry.kalin...@gmail.com wrote:
From: Dmitry Kalinkin
Also changes vme_bus_error_handler to take generic address modifier code
instead of raw contents of a device-specific attribute register.
Signed-off-by: Dmitry Kalinkin
Cc: Igor Alekseev
Acked-by: Martyn Welch
---
drivers/vme/bridges/vme_tsi148.c |4 ++-
drivers/vme/vme.c| 61 +-
drivers/vme/vme_bridge.h |4 +--
3 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
index c1f9385..76ccfae 100644
--- a/drivers/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -169,6 +169,7 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge
*tsi148_bridge)
unsigned int error_addr_high, error_addr_low;
unsigned long long error_addr;
u32 error_attrib;
+ int error_am;
struct tsi148_driver *bridge;
bridge = tsi148_bridge->driver_priv;
@@ -176,6 +177,7 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge
*tsi148_bridge)
error_addr_high = ioread32be(bridge->base + TSI148_LCSR_VEAU);
error_addr_low = ioread32be(bridge->base + TSI148_LCSR_VEAL);
error_attrib = ioread32be(bridge->base + TSI148_LCSR_VEAT);
+ error_am = (error_attrib & TSI148_LCSR_VEAT_AM_M) >> 8;
reg_join(error_addr_high, error_addr_low, &error_addr);
@@ -186,7 +188,7 @@ static u32 tsi148_VERR_irqhandler(struct vme_bridge *tsi148_bridge)
}
if (err_chk)
- vme_bus_error_handler(tsi148_bridge, error_addr, error_attrib);
+ vme_bus_error_handler(tsi148_bridge, error_addr, error_am);
else
dev_err(tsi148_bridge->parent,
"VME Bus Error at address: 0x%llx, attributes: %08x\n",
diff --git a/drivers/vme/vme.c b/drivers/vme/vme.c
index 6803744..2b79cd2 100644
--- a/drivers/vme/vme.c
+++ b/drivers/vme/vme.c
@@ -223,6 +223,39 @@ int vme_check_window(u32 aspace, unsigned long long
vme_base,
}
EXPORT_SYMBOL(vme_check_window);
+static u32 vme_get_aspace(int am)
+{
+ switch (am) {
+ case 0x29:
+ case 0x2D:
+ return VME_A16;
+ case 0x38:
+ case 0x39:
+ case 0x3A:
+ case 0x3B:
+ case 0x3C:
+ case 0x3D:
+ case 0x3E:
+ case 0x3F:
+ return VME_A24;
+ case 0x8:
+ case 0x9:
+ case 0xA:
+ case 0xB:
+ case 0xC:
+ case 0xD:
+ case 0xE:
+ case 0xF:
+ return VME_A32;
+ case 0x0:
+ case 0x1:
+ case 0x3:
+ return VME_A64;
+ }
+
+ return 0;
+}
+
/*
* Request a slave image with specific attributes, return some unique
* identifier.
@@ -991,14 +1024,14 @@ int vme_dma_free(struct vme_resource *resource)
EXPORT_SYMBOL(vme_dma_free);
void vme_bus_error_handler(struct vme_bridge *bridge,
- unsigned long long address, u32 attributes)
+ unsigned long long address, int am)
{
struct vme_bus_error *error;
error = kmalloc(sizeof(struct vme_bus_error), GFP_ATOMIC);
if (error) {
+ error->aspace = vme_get_aspace(am);
error->address = address;
- error->attributes = attributes;
list_add_tail(&error->list, &bridge->vme_errors);
} else {
dev_err(bridge->parent,
@@ -1019,19 +1052,13 @@ struct vme_bus_error *vme_find_error(struct vme_bridge
*bridge, u32 aspace,
bound = address + count;
- /*
-* XXX We are currently not looking at the address space when parsing
-* for errors. This is because parsing the Address Modifier Codes
-* is going to be quite resource intensive to do properly. We
-* should be OK just looking at the addresses and this is certainly
-* much better than what we had before.
-*/
err_pos = NULL;
/* Iterate through errors */
list_for_each(err_pos, &bridge->vme_errors) {
vme_err = list_entry(err_pos, struct vme_bus_error, list);
- if ((vme_err->address >= address) &&
- (vme_err->address < bound)) {
+ if ((vme_err->aspace == aspace) &&
+ (vme_err->address >= address) &&
+ (vme_err->address < bound)) {
valid = vme_err;
break;
@@ -1054,20 +1081,14 @@ void vme_clear_errors(struct vme_bridge *bridge, u32
aspace,
bound = address + count;
- /*
-* XXX We are currently not looking at the address space when parsing
-* for errors. This is because parsing the Address Modifier Codes
-* is going to be quite resource intensive to do properly. We
-* should be OK just looking at the addresses and this is certainly
-* muc
Re: [RESEND 3/4] vme: change bus error handling scheme
On 18/09/15 00:01, dmitry.kalin...@gmail.com wrote:
From: Dmitry Kalinkin
The current VME bus error handler adds errors to the bridge error list.
vme_master_{read,write} then traverses that list to look for relevant
errors.
Such scheme didn't work well for accesses going through vme_master_mmap
because they would also allocate a vme_bus_error, but have no way to do
vme_clear_errors call to free that memory.
This changes the error handling process to be other way around: now
vme_master_{read,write} defines a window in VME address space that will
catch possible errors. VME bus error interrupt only traverses these
windows and marks those that had errors in them.
Signed-off-by: Dmitry Kalinkin
Cc: Igor Alekseev
This one is currently causing the following warnings at build time:
CC drivers/vme/bridges/vme_tsi148.o
drivers/vme/bridges/vme_tsi148.c: In function ‘tsi148_master_read’:
drivers/vme/bridges/vme_tsi148.c:1254:14: warning: ‘handler’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
if (handler->num_errors) {
^
drivers/vme/bridges/vme_tsi148.c: In function ‘tsi148_master_write’:
drivers/vme/bridges/vme_tsi148.c:1352:14: warning: ‘handler’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
if (handler->num_errors) {
^
This appears to be because the pointer "handler" is set and checked in
one if statement controlled by "err_chk" and is used in a second. The
variable "err_chk" is a kernel param and from memory this can be set at
runtime, so there's a chance that the value of err_chk could be changed
between the two if statements (unlikely I know, but...) resulting in
handler being a null pointer.
Martyn
---
drivers/vme/bridges/vme_ca91cx42.c |3 +-
drivers/vme/bridges/vme_tsi148.c | 83
drivers/vme/vme.c | 92 +---
drivers/vme/vme_bridge.h | 23 +
4 files changed, 91 insertions(+), 110 deletions(-)
diff --git a/drivers/vme/bridges/vme_ca91cx42.c
b/drivers/vme/bridges/vme_ca91cx42.c
index f692efc..834883d 100644
--- a/drivers/vme/bridges/vme_ca91cx42.c
+++ b/drivers/vme/bridges/vme_ca91cx42.c
@@ -204,8 +204,7 @@ static int ca91cx42_irq_init(struct vme_bridge
*ca91cx42_bridge)
/* Need pdev */
pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, dev);
- /* Initialise list for VME bus errors */
- INIT_LIST_HEAD(&ca91cx42_bridge->vme_errors);
+ INIT_LIST_HEAD(&ca91cx42_bridge->vme_error_handlers);
mutex_init(&ca91cx42_bridge->irq_mtx);
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c
index 76ccfae..b0132e0 100644
--- a/drivers/vme/bridges/vme_tsi148.c
+++ b/drivers/vme/bridges/vme_tsi148.c
@@ -314,8 +314,7 @@ static int tsi148_irq_init(struct vme_bridge *tsi148_bridge)
bridge = tsi148_bridge->driver_priv;
- /* Initialise list for VME bus errors */
- INIT_LIST_HEAD(&tsi148_bridge->vme_errors);
+ INIT_LIST_HEAD(&tsi148_bridge->vme_error_handlers);
mutex_init(&tsi148_bridge->irq_mtx);
@@ -1187,7 +1186,7 @@ static ssize_t tsi148_master_read(struct vme_master_resource *image, void *buf,
int retval, enabled;
unsigned long long vme_base, size;
u32 aspace, cycle, dwidth;
- struct vme_bus_error *vme_err = NULL;
+ struct vme_error_handler *handler;
struct vme_bridge *tsi148_bridge;
void __iomem *addr = image->kern_base + offset;
unsigned int done = 0;
@@ -1197,6 +1196,17 @@ static ssize_t tsi148_master_read(struct
vme_master_resource *image, void *buf,
spin_lock(&image->lock);
+ if (err_chk) {
+ __tsi148_master_get(image, &enabled, &vme_base, &size, &aspace,
+ &cycle, &dwidth);
+ handler = vme_register_error_handler(tsi148_bridge, aspace,
+vme_base + offset, count);
+ if (!handler) {
+ spin_unlock(&image->lock);
+ return -ENOMEM;
+ }
+ }
+
/* The following code handles VME address alignment. We cannot use
* memcpy_xxx here because it may cut data transfers in to 8-bit
* cycles when D16 or D32 cycles are required on the VME bus.
@@ -1240,24 +1250,16 @@ static ssize_t tsi148_master_read(struct
vme_master_resource *image, void *buf,
out:
retval = count;
- if (!err_chk)
- goto skip_chk;
-
- __tsi148_master_get(image, &enabled, &vme_base, &size, &aspace, &cycle,
- &dwidth);
-
- vme_err = vme_find_error(tsi148_bridge, aspace, vme_base + offset,
- count);
- if (vme_err != NULL) {
- dev_err(image->parent->parent, "First VME read error detected "
- "an at address 0x%llx\n", vme_err->address);
-
Re: [RESEND 4/4] vme: print unhandled VME access errors
On 18/09/15 00:01, dmitry.kalin...@gmail.com wrote:
From: Dmitry Kalinkin
This will enable error messages for accesses done through mmap.
Signed-off-by: Dmitry Kalinkin
Acked-by: Martyn Welch
---
drivers/vme/vme.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/drivers/vme/vme.c b/drivers/vme/vme.c
index 7a10d92..72924b0 100644
--- a/drivers/vme/vme.c
+++ b/drivers/vme/vme.c
@@ -1028,6 +1028,7 @@ void vme_bus_error_handler(struct vme_bridge *bridge,
{
struct list_head *handler_pos = NULL;
struct vme_error_handler *handler;
+ int handler_triggered = 0;
u32 aspace = vme_get_aspace(am);
list_for_each(handler_pos, &bridge->vme_error_handlers) {
@@ -1040,8 +1041,14 @@ void vme_bus_error_handler(struct vme_bridge *bridge,
handler->first_error = address;
if (handler->num_errors != UINT_MAX)
handler->num_errors++;
+ handler_triggered = 1;
}
}
+
+ if (!handler_triggered)
+ dev_err(bridge->parent,
+ "Unhandled VME access error at address 0x%llx\n",
+ address);
}
EXPORT_SYMBOL(vme_bus_error_handler);
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/3] Staging: comedi: Fixed coding style issues in comedi.h
This patch is to the comedi.h file that fixes up following type
of 42 warning in the file:
-Blocking comments use a trailing */ on a separate line
-Block comments use * on subsequent lines
Signed-off-by: Punit Vara
---
drivers/staging/comedi/comedi.h | 183 +++-
1 file changed, 107 insertions(+), 76 deletions(-)
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 66edda1..4bc4b6c 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -1,20 +1,20 @@
-/*
-include/comedi.h (installed as /usr/include/comedi.h)
-header file for comedi
-
-COMEDI - Linux Control and Measurement Device Interface
-Copyright (C) 1998-2001 David A. Schleef
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-*/
+/**
+ * include/comedi.h (installed as /usr/include/comedi.h)
+ * header file for comedi
+
+ * COMEDI - Linux Control and Measurement Device Interface
+ * Copyright (C) 1998-2001 David A. Schleef
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#ifndef _COMEDI_H
#define _COMEDI_H
@@ -27,17 +27,17 @@
/* comedi's major device number */
#define COMEDI_MAJOR 98
-/*
- maximum number of minor devices. This can be increased, although
- kernel structures are currently statically allocated, thus you
- don't want this to be much more than you actually use.
+/**
+ * maximum number of minor devices. This can be increased, although
+ * kernel structures are currently statically allocated, thus you
+ * don't want this to be much more than you actually use.
*/
#define COMEDI_NDEVICES 16
/* number of config options in the config structure */
#define COMEDI_NDEVCONFOPTS 32
-/*
+/**
* NOTE: 'comedi_config --init-data' is deprecated
*
* The following indexes in the config options were used by
@@ -298,7 +298,7 @@ enum configuration_ids {
INSN_CONFIG_PWM_GET_H_BRIDGE = 5004
};
-/*
+/**
* Settings for INSN_CONFIG_DIGITAL_TRIG:
* data[0] = INSN_CONFIG_DIGITAL_TRIG
* data[1] = trigger ID
@@ -520,24 +520,24 @@ struct comedi_bufinfo {
/* everything after this line is ALPHA */
/**/
-/*
- 8254 specific configuration.
+/**
+ * 8254 specific configuration.
- It supports two config commands:
+ * It supports two config commands:
- 0 ID: INSN_CONFIG_SET_COUNTER_MODE
- 1 8254 Mode
-I8254_MODE0, I8254_MODE1, ..., I8254_MODE5
-OR'ed with:
-I8254_BCD, I8254_BINARY
+ * 0 ID: INSN_CONFIG_SET_COUNTER_MODE
+ * 1 8254 Mode
+ * I8254_MODE0, I8254_MODE1, ..., I8254_MODE5
+ * OR'ed with:
+ * I8254_BCD, I8254_BINARY
- 0 ID: INSN_CONFIG_8254_READ_STATUS
- 1 <-- Status byte returned here.
-B7 = Output
-B6 = NULL Count
-B5 - B0 Current mode.
-
-*/
+ * 0 ID: INSN_CONFIG_8254_READ_STATUS
+ * 1 <-- Status byte returned here.
+ * B7 = Output
+ * B6 = NULL Count
+ * B5 - B0 Current mode.
+ *
+ */
enum i8254_mode {
I8254_MODE0 = (0 << 1), /* Interrupt on terminal count */
@@ -555,8 +555,10 @@ enum i8254_mode {
#define NI_USUAL_PFI_SELECT(x) (((x) < 10) ? (0x1 + (x)) : (0xb + (x)))
#define NI_USUAL_RTSI_SELECT(x)(((x) < 7) ? (0xb + (x)) : 0x1b)
-/* mode bits for NI general-purpose counters, set with
- * INSN_CONFIG_SET_COUNTER_MODE */
+/**
+ * mode bits for NI general-purpose counters, set with
+ * INSN_CONFIG_SET_COUNTER_MODE
+ */
#define NI_GPCT_COUNTING_MODE_SHIFT 16
#define NI_GPCT_INDEX_PHASE_BITSHIFT 20
#define NI_GPCT_COUNTING_DIRECTION_SHIFT 24
@@ -624,8 +626,10 @@ enum ni_gpct_mode_bits {
NI_GPCT_INVERT_OUTPUT_BIT = 0x2000
};
-/* Bits for setting a clock source with
- * INSN_CONFIG_SET_CLOCK_SRC when using NI general-purpose counters. */
+/**
+ * Bits for setting a clock source with
+ * INSN_CONFIG_SET_CLOCK_SRC when using NI general-purpose counters.
+ */
enum ni_gpct_clock_source_bits {
NI_GPCT_CLOCK_SRC_SELECT_MASK = 0x3f,
NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS = 0x0,
@@
[PATCH] Staging: comedi: Fixed coding style issues in comedi.h
This patch is to the comedi.h file that fixes up following type
of 42 warning in the file:
-Blocking comments use a trailing */ on a separate line
-Block comments use * on subsequent lines
Signed-off-by: Punit Vara
---
drivers/staging/comedi/comedi.h | 183 +++-
1 file changed, 107 insertions(+), 76 deletions(-)
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index 66edda1..4bc4b6c 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -1,20 +1,20 @@
-/*
-include/comedi.h (installed as /usr/include/comedi.h)
-header file for comedi
-
-COMEDI - Linux Control and Measurement Device Interface
-Copyright (C) 1998-2001 David A. Schleef
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-*/
+/**
+ * include/comedi.h (installed as /usr/include/comedi.h)
+ * header file for comedi
+
+ * COMEDI - Linux Control and Measurement Device Interface
+ * Copyright (C) 1998-2001 David A. Schleef
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#ifndef _COMEDI_H
#define _COMEDI_H
@@ -27,17 +27,17 @@
/* comedi's major device number */
#define COMEDI_MAJOR 98
-/*
- maximum number of minor devices. This can be increased, although
- kernel structures are currently statically allocated, thus you
- don't want this to be much more than you actually use.
+/**
+ * maximum number of minor devices. This can be increased, although
+ * kernel structures are currently statically allocated, thus you
+ * don't want this to be much more than you actually use.
*/
#define COMEDI_NDEVICES 16
/* number of config options in the config structure */
#define COMEDI_NDEVCONFOPTS 32
-/*
+/**
* NOTE: 'comedi_config --init-data' is deprecated
*
* The following indexes in the config options were used by
@@ -298,7 +298,7 @@ enum configuration_ids {
INSN_CONFIG_PWM_GET_H_BRIDGE = 5004
};
-/*
+/**
* Settings for INSN_CONFIG_DIGITAL_TRIG:
* data[0] = INSN_CONFIG_DIGITAL_TRIG
* data[1] = trigger ID
@@ -520,24 +520,24 @@ struct comedi_bufinfo {
/* everything after this line is ALPHA */
/**/
-/*
- 8254 specific configuration.
+/**
+ * 8254 specific configuration.
- It supports two config commands:
+ * It supports two config commands:
- 0 ID: INSN_CONFIG_SET_COUNTER_MODE
- 1 8254 Mode
-I8254_MODE0, I8254_MODE1, ..., I8254_MODE5
-OR'ed with:
-I8254_BCD, I8254_BINARY
+ * 0 ID: INSN_CONFIG_SET_COUNTER_MODE
+ * 1 8254 Mode
+ * I8254_MODE0, I8254_MODE1, ..., I8254_MODE5
+ * OR'ed with:
+ * I8254_BCD, I8254_BINARY
- 0 ID: INSN_CONFIG_8254_READ_STATUS
- 1 <-- Status byte returned here.
-B7 = Output
-B6 = NULL Count
-B5 - B0 Current mode.
-
-*/
+ * 0 ID: INSN_CONFIG_8254_READ_STATUS
+ * 1 <-- Status byte returned here.
+ * B7 = Output
+ * B6 = NULL Count
+ * B5 - B0 Current mode.
+ *
+ */
enum i8254_mode {
I8254_MODE0 = (0 << 1), /* Interrupt on terminal count */
@@ -555,8 +555,10 @@ enum i8254_mode {
#define NI_USUAL_PFI_SELECT(x) (((x) < 10) ? (0x1 + (x)) : (0xb + (x)))
#define NI_USUAL_RTSI_SELECT(x)(((x) < 7) ? (0xb + (x)) : 0x1b)
-/* mode bits for NI general-purpose counters, set with
- * INSN_CONFIG_SET_COUNTER_MODE */
+/**
+ * mode bits for NI general-purpose counters, set with
+ * INSN_CONFIG_SET_COUNTER_MODE
+ */
#define NI_GPCT_COUNTING_MODE_SHIFT 16
#define NI_GPCT_INDEX_PHASE_BITSHIFT 20
#define NI_GPCT_COUNTING_DIRECTION_SHIFT 24
@@ -624,8 +626,10 @@ enum ni_gpct_mode_bits {
NI_GPCT_INVERT_OUTPUT_BIT = 0x2000
};
-/* Bits for setting a clock source with
- * INSN_CONFIG_SET_CLOCK_SRC when using NI general-purpose counters. */
+/**
+ * Bits for setting a clock source with
+ * INSN_CONFIG_SET_CLOCK_SRC when using NI general-purpose counters.
+ */
enum ni_gpct_clock_source_bits {
NI_GPCT_CLOCK_SRC_SELECT_MASK = 0x3f,
NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS = 0x0,
@@
Re: Fwd: About the Android Low Memory Killer
On Thu, Sep 17, 2015 at 4:53 PM Greg KH wrote: > > On Thu, Sep 17, 2015 at 03:24:37PM +0100, Viacheslav Kovalevskyi wrote: > > Hi there, > > > > Apologies for the complete nuby question, I want to help with porting > > Android LMK (drivers/staging/android/lowmemorykiller.c) from the > > staging to the master. Where I can find more information about the > > current challenges that need to be solved before porting it to the > > master? > > If you don't have experience with the mm core, I STRONGLY suggest that > you not worry about this as the issues involved are tricky and people > keep arguing about them. > > See the lwn.net writeup last week for details about why this isn't > merged into the mainline kernel yet, and why it's probably not going to > happen anytime soon (hint, missing infrastructure in the mm core). > > sorry, > greg k-h Thank you Greg for the response, it's always nice to receive the response from the famous people =) Could you recommend a good source (book?) about the MM core in Linux? PS: at the moment i'm investigating Mail thread on the lwn ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: lustre: lustre: obdclass: Removed a space
Removed a space to fix the following coding style error detected by checkpatch.pl ERROR: space prohibited before that '++' (ctx:WxO) Signed-off-by: Anjali Menon --- drivers/staging/lustre/lustre/obdclass/llog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/obdclass/llog.c b/drivers/staging/lustre/lustre/obdclass/llog.c index 114be4a..bb7f912 100644 --- a/drivers/staging/lustre/lustre/obdclass/llog.c +++ b/drivers/staging/lustre/lustre/obdclass/llog.c @@ -522,7 +522,7 @@ int llog_reverse_process(const struct lu_env *env, rec = (void *)rec + rec->lrh_len; if (LLOG_REC_HDR_NEEDS_SWABBING(rec)) lustre_swab_llog_rec(rec); - idx ++; + idx++; } LASSERT(idx == index); tail = (void *)rec + rec->lrh_len - sizeof(*tail); -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: comedi: Fixed coding style issues in comedi.h
On 18/09/15 13:30, Punit Vara wrote: This patch is to the comedi.h file that fixes up following type of 42 warning in the file: -Blocking comments use a trailing */ on a separate line -Block comments use * on subsequent lines Signed-off-by: Punit Vara --- drivers/staging/comedi/comedi.h | 183 +++- 1 file changed, 107 insertions(+), 76 deletions(-) diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 66edda1..4bc4b6c 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -1,20 +1,20 @@ -/* -include/comedi.h (installed as /usr/include/comedi.h) -header file for comedi - -COMEDI - Linux Control and Measurement Device Interface -Copyright (C) 1998-2001 David A. Schleef - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -*/ +/** That's the wrong sort of comment opening. It should be '/*'. The '/**' form is reserved for kernel-doc mark-up. + * include/comedi.h (installed as /usr/include/comedi.h) + * header file for comedi + These blank lines in the block comment should be ' *'. (The same applies to the other comments you changed in this patch.) -- -=( Ian Abbott @ MEV Ltd.E-mail: )=- -=( Web: http://www.mev.co.uk/ )=- ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: Fwd: About the Android Low Memory Killer
On Fri, Sep 18, 2015 at 01:32:57PM +0100, Viacheslav Kovalevskyi wrote: > On Thu, Sep 17, 2015 at 4:53 PM Greg KH wrote: > > > > On Thu, Sep 17, 2015 at 03:24:37PM +0100, Viacheslav Kovalevskyi wrote: > > > Hi there, > > > > > > Apologies for the complete nuby question, I want to help with porting > > > Android LMK (drivers/staging/android/lowmemorykiller.c) from the > > > staging to the master. Where I can find more information about the > > > current challenges that need to be solved before porting it to the > > > master? > > > > If you don't have experience with the mm core, I STRONGLY suggest that > > you not worry about this as the issues involved are tricky and people > > keep arguing about them. > > > > See the lwn.net writeup last week for details about why this isn't > > merged into the mainline kernel yet, and why it's probably not going to > > happen anytime soon (hint, missing infrastructure in the mm core). > > > > sorry, > > greg k-h > > Thank you Greg for the response, it's always nice to receive the > response from the famous people =) > > Could you recommend a good source (book?) about the MM core in Linux? Sorry, I have no recommendations for something like that, other than the code itself. Good luck! greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: comedi: Fixed coding style issue in comedilib.h
This patch is to the comedilib.h file that fixes up coding style issues and following warning: - Block comments use * on subsequent lines Signed-off-by: Punit Vara --- drivers/staging/comedi/comedilib.h | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/comedilib.h b/drivers/staging/comedi/comedilib.h index 56baf85..45da22b 100644 --- a/drivers/staging/comedi/comedilib.h +++ b/drivers/staging/comedi/comedilib.h @@ -1,20 +1,20 @@ -/* -linux/include/comedilib.h -header file for kcomedilib +/** + * linux/include/comedilib.h + * header file for kcomedilib -COMEDI - Linux Control and Measurement Device Interface -Copyright (C) 1998-2001 David A. Schleef + * COMEDI - Linux Control and Measurement Device Interface + * Copyright (C) 1998-2001 David A. Schleef -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -*/ + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #ifndef _LINUX_COMEDILIB_H #define _LINUX_COMEDILIB_H -- 2.5.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: comedi: Fixed coding style issue in comedilib.h
On 18/09/15 15:34, Punit Vara wrote: This patch is to the comedilib.h file that fixes up coding style issues and following warning: - Block comments use * on subsequent lines Signed-off-by: Punit Vara --- drivers/staging/comedi/comedilib.h | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/comedi/comedilib.h b/drivers/staging/comedi/comedilib.h index 56baf85..45da22b 100644 --- a/drivers/staging/comedi/comedilib.h +++ b/drivers/staging/comedi/comedilib.h @@ -1,20 +1,20 @@ -/* -linux/include/comedilib.h -header file for kcomedilib +/** Please use '/*' not '/**' here. + * linux/include/comedilib.h + * header file for kcomedilib -COMEDI - Linux Control and Measurement Device Interface -Copyright (C) 1998-2001 David A. Schleef + * COMEDI - Linux Control and Measurement Device Interface + * Copyright (C) 1998-2001 David A. Schleef -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -*/ + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ Blank lines in the block comment should be ' *'. -- -=( Ian Abbott @ MEV Ltd.E-mail: )=- -=( Web: http://www.mev.co.uk/ )=- ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: comedi: comedi_fops.c: remove bogus kernel-doc for runflags
The comment before the `COMEDI_SRF_...` macros starts with a kernel-doc mark but isn't valid kernel-doc. There isn't a kernel-doc template for a group of macro constants. These macros are all private anyway, so don't really need to be in kernel-doc. Just change it to a normal comment. Signed-off-by: Ian Abbott --- drivers/staging/comedi/comedi_fops.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 0e8a451..47d1648 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -43,15 +43,15 @@ #include "comedi_internal.h" -/** +/* * comedi_subdevice "runflags" - * @COMEDI_SRF_RT: DEPRECATED: command is running real-time - * @COMEDI_SRF_ERROR: indicates an COMEDI_CB_ERROR event has occurred + * COMEDI_SRF_RT: DEPRECATED: command is running real-time + * COMEDI_SRF_ERROR: indicates an COMEDI_CB_ERROR event has occurred * since the last command was started - * @COMEDI_SRF_RUNNING:command is running - * @COMEDI_SRF_FREE_SPRIV: free s->private on detach + * COMEDI_SRF_RUNNING: command is running + * COMEDI_SRF_FREE_SPRIV: free s->private on detach * - * @COMEDI_SRF_BUSY_MASK: runflags that indicate the subdevice is "busy" + * COMEDI_SRF_BUSY_MASK: runflags that indicate the subdevice is "busy" */ #define COMEDI_SRF_RT BIT(1) #define COMEDI_SRF_ERROR BIT(2) -- 2.5.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] IB/hfi1: fix sdma_descq_cnt parameter parsing
On 09/15/2015 10:19 AM, Mike Marciniszyn wrote: > The boolean tests should have been or-ed. > > Reported-by: David Binderman > Reviewed-by: Jubin John > Signed-off-by: Mike Marciniszyn Thanks, applied. -- Doug Ledford GPG KeyID: 0E572FDD signature.asc Description: OpenPGP digital signature ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [patch] IB/hfi1: fix copy_to/from_user() error handling
On 09/15/2015 06:35 AM, Dan Carpenter wrote: > copy_to/from_user() returns the number of bytes which we were not able > to copy. It doesn't return an error code. > > Also a couple places had a printk() on error and I removed that because > people can take advantage of it to fill /var/log/messages with spam. > > Signed-off-by: Dan Carpenter Thanks, applied. -- Doug Ledford GPG KeyID: 0E572FDD signature.asc Description: OpenPGP digital signature ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [patch] IB/hfi1: checking for NULL instead of IS_ERR
On 09/16/2015 02:22 AM, Dan Carpenter wrote: > __get_txreq() returns an ERR_PTR() but this checks for NULL so it would > oops on failure. > > Signed-off-by: Dan Carpenter Thanks, applied. -- Doug Ledford GPG KeyID: 0E572FDD signature.asc Description: OpenPGP digital signature ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [patch] IB/hfi1: fix a locking bug
On 09/16/2015 02:22 AM, Dan Carpenter wrote: > mutex_trylock() returns zero on failure, not EBUSY. > > Signed-off-by: Dan Carpenter Thanks, applied. -- Doug Ledford GPG KeyID: 0E572FDD signature.asc Description: OpenPGP digital signature ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [patch v2] IB/hfi1: info leak in get_ctxt_info()
On 09/16/2015 02:42 AM, Dan Carpenter wrote: > The cinfo struct has a hole after the last struct member so we need to > zero it out. Otherwise we disclose some uninitialized stack data. > > Signed-off-by: Dan Carpenter Thanks, applied. -- Doug Ledford GPG KeyID: 0E572FDD signature.asc Description: OpenPGP digital signature ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [RESEND 3/4] vme: change bus error handling scheme
On Fri, Sep 18, 2015 at 5:46 AM, Martyn Welch wrote:
>
>
> On 18/09/15 00:01, dmitry.kalin...@gmail.com wrote:
>>
>> From: Dmitry Kalinkin
>>
>> The current VME bus error handler adds errors to the bridge error list.
>> vme_master_{read,write} then traverses that list to look for relevant
>> errors.
>>
>> Such scheme didn't work well for accesses going through vme_master_mmap
>> because they would also allocate a vme_bus_error, but have no way to do
>> vme_clear_errors call to free that memory.
>>
>> This changes the error handling process to be other way around: now
>> vme_master_{read,write} defines a window in VME address space that will
>> catch possible errors. VME bus error interrupt only traverses these
>> windows and marks those that had errors in them.
>>
>> Signed-off-by: Dmitry Kalinkin
>> Cc: Igor Alekseev
>
>
> This one is currently causing the following warnings at build time:
>
> CC drivers/vme/bridges/vme_tsi148.o
> drivers/vme/bridges/vme_tsi148.c: In function ‘tsi148_master_read’:
> drivers/vme/bridges/vme_tsi148.c:1254:14: warning: ‘handler’ may be used
> uninitialized in this function [-Wmaybe-uninitialized]
>if (handler->num_errors) {
> ^
> drivers/vme/bridges/vme_tsi148.c: In function ‘tsi148_master_write’:
> drivers/vme/bridges/vme_tsi148.c:1352:14: warning: ‘handler’ may be used
> uninitialized in this function [-Wmaybe-uninitialized]
>if (handler->num_errors) {
> ^
>
> This appears to be because the pointer "handler" is set and checked in one
> if statement controlled by "err_chk" and is used in a second. The variable
> "err_chk" is a kernel param and from memory this can be set at runtime, so
> there's a chance that the value of err_chk could be changed between the two
> if statements (unlikely I know, but...) resulting in handler being a null
> pointer.
err_chk is not exported to sysfs, so there is no race now. To be on the safe
side I could set initial value of handler to NULL and change second condition
from "if (err_chk)" to "if (handler)" or "if (err_chk && handler)" or make a
separate local variable to hold a copy of err_chk flag.
>
> Martyn
>
>
>> ---
>> drivers/vme/bridges/vme_ca91cx42.c |3 +-
>> drivers/vme/bridges/vme_tsi148.c | 83
>>
>> drivers/vme/vme.c | 92
>> +---
>> drivers/vme/vme_bridge.h | 23 +
>> 4 files changed, 91 insertions(+), 110 deletions(-)
>>
>> diff --git a/drivers/vme/bridges/vme_ca91cx42.c
>> b/drivers/vme/bridges/vme_ca91cx42.c
>> index f692efc..834883d 100644
>> --- a/drivers/vme/bridges/vme_ca91cx42.c
>> +++ b/drivers/vme/bridges/vme_ca91cx42.c
>> @@ -204,8 +204,7 @@ static int ca91cx42_irq_init(struct vme_bridge
>> *ca91cx42_bridge)
>> /* Need pdev */
>> pdev = container_of(ca91cx42_bridge->parent, struct pci_dev, dev);
>> - /* Initialise list for VME bus errors */
>> - INIT_LIST_HEAD(&ca91cx42_bridge->vme_errors);
>> + INIT_LIST_HEAD(&ca91cx42_bridge->vme_error_handlers);
>> mutex_init(&ca91cx42_bridge->irq_mtx);
>> diff --git a/drivers/vme/bridges/vme_tsi148.c
>> b/drivers/vme/bridges/vme_tsi148.c
>> index 76ccfae..b0132e0 100644
>> --- a/drivers/vme/bridges/vme_tsi148.c
>> +++ b/drivers/vme/bridges/vme_tsi148.c
>> @@ -314,8 +314,7 @@ static int tsi148_irq_init(struct vme_bridge
>> *tsi148_bridge)
>> bridge = tsi148_bridge->driver_priv;
>> - /* Initialise list for VME bus errors */
>> - INIT_LIST_HEAD(&tsi148_bridge->vme_errors);
>> + INIT_LIST_HEAD(&tsi148_bridge->vme_error_handlers);
>> mutex_init(&tsi148_bridge->irq_mtx);
>> @@ -1187,7 +1186,7 @@ static ssize_t tsi148_master_read(struct
>> vme_master_resource *image, void *buf,
>> int retval, enabled;
>> unsigned long long vme_base, size;
>> u32 aspace, cycle, dwidth;
>> - struct vme_bus_error *vme_err = NULL;
>> + struct vme_error_handler *handler;
>> struct vme_bridge *tsi148_bridge;
>> void __iomem *addr = image->kern_base + offset;
>> unsigned int done = 0;
>> @@ -1197,6 +1196,17 @@ static ssize_t tsi148_master_read(struct
>> vme_master_resource *image, void *buf,
>> spin_lock(&image->lock);
>> + if (err_chk) {
>> + __tsi148_master_get(image, &enabled, &vme_base, &size,
>> &aspace,
>> + &cycle, &dwidth);
>> + handler = vme_register_error_handler(tsi148_bridge,
>> aspace,
>> +vme_base + offset,
>> count);
>> + if (!handler) {
>> + spin_unlock(&image->lock);
>> + return -ENOMEM;
>> + }
>> + }
>> +
>> /* The following code handles VME address alignment. We cannot use
>> * memcpy_xxx here because it may cut data transfers in to 8-bit
>> * cycles when D16 or D32
[PATCH] Staging: Comedi: Fix coding style issue in comedi_pcmcia.h
This patch is to comedi_pcmcia.h that fixes up warning related character limitation given by checkpatch.pl. Warning " line over 80 characters" is removed now. Signed-off-by: Punit Vara --- drivers/staging/comedi/comedi_pcmcia.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/comedi/comedi_pcmcia.h b/drivers/staging/comedi/comedi_pcmcia.h index 5d3db2b..5a572c2 100644 --- a/drivers/staging/comedi/comedi_pcmcia.h +++ b/drivers/staging/comedi/comedi_pcmcia.h @@ -39,7 +39,8 @@ void comedi_pcmcia_driver_unregister(struct comedi_driver *, struct pcmcia_driver *); /** - * module_comedi_pcmcia_driver() - Helper macro for registering a comedi PCMCIA driver + * module_comedi_pcmcia_driver() - Helper macro for registering a comedi + * PCMCIA driver * @__comedi_driver: comedi_driver struct * @__pcmcia_driver: pcmcia_driver struct * -- 2.5.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: comedi: Fix coding style issues
This patch is to comedidev.h file that fixes up following warnings
reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
-Block comments use * on subsequent lines
Signed-off-by: Punit Vara
---
drivers/staging/comedi/comedidev.h | 62 --
1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/comedi/comedidev.h
b/drivers/staging/comedi/comedidev.h
index 28a5d3a..5b0ab03 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -1,20 +1,20 @@
/*
-include/linux/comedidev.h
-header file for kernel-only structures, variables, and constants
-
-COMEDI - Linux Control and Measurement Device Interface
-Copyright (C) 1997-2000 David A. Schleef
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-*/
+ * include/linux/comedidev.h
+ * header file for kernel-only structures, variables, and constants
+ *
+ * COMEDI - Linux Control and Measurement Device Interface
+ * Copyright (C) 1997-2000 David A. Schleef
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#ifndef _COMEDIDEV_H
#define _COMEDIDEV_H
@@ -105,7 +105,7 @@ struct comedi_buf_map {
struct kref refcount;
};
-/**
+/*
* struct comedi_async - control data for asynchronous comedi commands
* @prealloc_buf: preallocated buffer
* @prealloc_bufsz:buffer size (in bytes)
@@ -215,7 +215,7 @@ struct comedi_async {
unsigned int x);
};
-/**
+/*
* comedi_async callback "events"
* @COMEDI_CB_EOS: end-of-scan
* @COMEDI_CB_EOA: end-of-acquisition/output
@@ -262,9 +262,11 @@ struct comedi_device {
struct device *class_dev;
int minor;
unsigned int detach_count;
- /* hw_dev is passed to dma_alloc_coherent when allocating async buffers
+ /*
+* hw_dev is passed to dma_alloc_coherent when allocating async buffers
* for subdevices that have async_dma_dir set to something other than
-* DMA_NONE */
+* DMA_NONE
+*/
struct device *hw_dev;
const char *board_name;
@@ -391,7 +393,7 @@ static inline unsigned int comedi_offset_munge(struct
comedi_subdevice *s,
return val ^ s->maxdata ^ (s->maxdata >> 1);
}
-/**
+/*
* comedi_bytes_per_sample - determine subdevice sample size
* @s: comedi_subdevice struct
*
@@ -405,7 +407,7 @@ static inline unsigned int comedi_bytes_per_sample(struct
comedi_subdevice *s)
return s->subdev_flags & SDF_LSAMPL ? sizeof(int) : sizeof(short);
}
-/**
+/*
* comedi_sample_shift - determine log2 of subdevice sample size
* @s: comedi_subdevice struct
*
@@ -421,7 +423,7 @@ static inline unsigned int comedi_sample_shift(struct
comedi_subdevice *s)
return s->subdev_flags & SDF_LSAMPL ? 2 : 1;
}
-/**
+/*
* comedi_bytes_to_samples - converts a number of bytes to a number of samples
* @s: comedi_subdevice struct
* @nbytes:number of bytes
@@ -434,7 +436,7 @@ static inline unsigned int comedi_bytes_to_samples(struct
comedi_subdevice *s,
return nbytes >> comedi_sample_shift(s);
}
-/**
+/*
* comedi_samples_to_bytes - converts a number of samples to a number of bytes
* @s: comedi_subdevice struct
* @nsamples: number of samples
@@ -448,7 +450,7 @@ static inline unsigned int comedi_samples_to_bytes(struct
comedi_subdevice *s,
return nsamples << comedi_sample_shift(s);
}
-/**
+/*
* comedi_check_trigger_src() - trivially validate a comedi_cmd trigger source
* @src: pointer to the trigger source to validate
* @flags: bitmask of valid TRIG_* for the trigger
@@ -469,7 +471,7 @@ static inline int comedi_check_trigger_src(unsigned int
*src,
return 0;
}
-/**
+/*
* comedi_check_trigger_is_unique() - make sure a trigger source is unique
* @src: the trigger source to check
*/
@@ -481,7 +483,7 @@ static inline int comedi_check_trigger_is_unique(unsigned
int src)
return 0;
}
-/**
+/*
* comedi_check_trigger_ar
Re: [PATCH] staging/rtl8188eu/core/rtw.cmd.c memcpy replacement
On 09/18/2015 03:19 PM, BryanSPaul wrote: replaced memcpy functions with ether_addr_copy Signed-off-by: Bryan Paul You seem not to be aware that ether_addr_copy() requires alignment of the operands. Until you demonstrate that you have investigated such alignment, NACK Larry --- drivers/staging/rtl8188eu/core/rtw_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c index 54eb765..1bd3b36 100644 --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c @@ -460,7 +460,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) /* the driver just has the bssid information for PMKIDList searching. */ if (!pmlmepriv->assoc_by_bssid) - memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.MacAddress[0], ETH_ALEN); + ether_addr_copy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.MacAddress[0]); psecnetwork->IELength = rtw_restruct_sec_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength); @@ -731,7 +731,7 @@ u8 rtw_addbareq_cmd(struct adapter *padapter, u8 tid, u8 *addr) } paddbareq_parm->tid = tid; - memcpy(paddbareq_parm->addr, addr, ETH_ALEN); + ether_addr_copy(paddareq_parm->addr); init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq)); -- 2.4.6 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: android: Fix 80 character length
On Fri, Sep 18, 2015 at 02:24:16PM +0530, Punit Vara wrote: > This patch is to the Kconfig file which fixes up lines which > exceeded the standard 80 character limitation. > This file also fixes up 3 warnings regarding paragraph. Why is this indented? > > Signed-off-by: Punit Vara > --- > drivers/staging/android/Kconfig | 28 > 1 file changed, 16 insertions(+), 12 deletions(-) > > diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig > index 42b1512..f4a2371 100644 > --- a/drivers/staging/android/Kconfig > +++ b/drivers/staging/android/Kconfig > @@ -12,7 +12,8 @@ config ASHMEM > file-based API. > > It is, in theory, a good memory allocator for low-memory devices, > - because it can discard shared memory units when under memory pressure. This is 80 characters wide, no need to change it. > + because it can discard shared memory units when under memory > + pressure. > > config ANDROID_TIMED_OUTPUT > bool "Timed output class driver" > @@ -24,19 +25,20 @@ config ANDROID_TIMED_GPIO > depends on ANDROID_TIMED_OUTPUT > default n > ---help--- > - Unlike generic gpio is to allow programs to access and manipulate gpio > - registers from user space, timed output/gpio is a system to allow > changing > - a gpio pin and restore it automatically after a specified timeout. > + Unlike generic gpio is to allow programs to access and manipulate > + gpio registers from user space, timed output/gpio is a system to > + allow changing a gpio pin and restore it automatically after a > + specified timeout. > > config ANDROID_LOW_MEMORY_KILLER > bool "Android Low Memory Killer" > ---help--- > - Registers processes to be killed when low memory conditions, this is > useful > - as there is no particular swap space on android. > + Registers processes to be killed when low memory conditions, this > + is useful as there is no particular swap space on android. > > - The registered process will kills according to the priorities in > android init > - scripts (/init.rc), and it defines priority values with minimum free > memory size > - for each priority. > + The registered process will kills according to the priorities in > + android init scripts (/init.rc), and it defines priority values with > + minimum free memory size for each priority. > > config SYNC > bool "Synchronization framework" > @@ -44,8 +46,9 @@ config SYNC > select ANON_INODES > select DMA_SHARED_BUFFER > ---help--- > - This option enables the framework for synchronization between multiple This is also ok. > - drivers. Sync implementations can take advantage of hardware > + This option enables the framework for synchronization between > + multiple drivers. > + Sync implementations can take advantage of hardware > synchronization built into devices like GPUs. > > config SW_SYNC > @@ -54,7 +57,8 @@ config SW_SYNC > depends on SYNC > ---help--- > A sync object driver that uses a 32bit counter to coordinate > - synchronization. Useful when there is no hardware primitive backing And this is just fine, why change it? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 3/3] Staging: comedi: Fixed coding style issues in comedi.h
On Fri, Sep 18, 2015 at 05:56:19PM +0530, Punit Vara wrote: > This patch is to the comedi.h file that fixes up following type > of 42 warning in the file: > > -Blocking comments use a trailing */ on a separate line > -Block comments use * on subsequent lines Why all of the trailing whitespace in your changelog comment? Why indent it? ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH V2 3/8] staging: wilc1000: replace int8_t with int
On Thu, Sep 17, 2015 at 09:03:14PM +0900, Chaehyun Lim wrote: > On Thu, Sep 17, 2015 at 7:34 PM, Sudip Mukherjee > wrote: > > On Thu, Sep 17, 2015 at 04:48:44PM +0900, Chaehyun Lim wrote: > >> This patch replaces int8_t with int. just use return type as int. > >> > >> Signed-off-by: Chaehyun Lim > >> --- > > but isn't int8_t is defined as char? > > > > Even int8_t is defined as char, I think it's no problem to use int. > Is it need to change as char? No, you need to make it a u8 (or s8, depending on the usage). Be very careful when changing variable widths. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: lustre: lustre: obdclass: Removed a space
On Fri, Sep 18, 2015 at 06:18:13PM +0530, Anjali Menon wrote: > Removed a space to fix the following coding style error detected > by checkpatch.pl > > ERROR: space prohibited before that '++' (ctx:WxO) > > Signed-off-by: Anjali Menon > --- > drivers/staging/lustre/lustre/obdclass/llog.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This does not apply to my tree at all, what did you make it against? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: Comedi: Fix coding style issue in comedi_pcmcia.h
On Fri, Sep 18, 2015 at 09:55:23PM +0530, Punit Vara wrote: > This patch is to comedi_pcmcia.h that fixes up warning related > character limitation given by checkpatch.pl. > Warning " line over 80 characters" is removed now. Nope, you just broke kerneldoc formatting :( Sorry, it's tricky, and kerneldoc is messy, but this code is just fine as-is. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [patch] IB/hfi1: checking for NULL instead of IS_ERR
On Fri, Sep 18, 2015 at 11:51:09AM -0400, Doug Ledford wrote: > On 09/16/2015 02:22 AM, Dan Carpenter wrote: > > __get_txreq() returns an ERR_PTR() but this checks for NULL so it would > > oops on failure. > > > > Signed-off-by: Dan Carpenter > > Thanks, applied. Applied to what? Should I just ignore these types of patches and not take them in my tree and you will send them on later on? I don't remember what we agreed to do, sorry. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: lustre: lustre: lclient: Removed the else statement
On Thu, Sep 17, 2015 at 09:44:41PM +0530, Anjali Menon wrote:
> Removed the else statement along with some unwanted brackets
> to fix the following coding style warning detected by
> checkpatch.
>
> WARNING: else is not generally useful after a break or return
>
> Signed-off-by: Anjali Menon
> ---
> drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 16 +++-
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> index ab6cb41..23092fc 100644
> --- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> +++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> @@ -836,7 +836,7 @@ int ccc_prep_size(const struct lu_env *env, struct
> cl_object *obj,
> *exceed = 1;
> }
> return result;
> - } else {
> + }
> /*
>* region is within kms and, hence, within real file
>* size (A). We need to increase i_size to cover the
This change isn't correct, look at how the code now looks :(
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 03/34] staging: wilc1000: rename strHostIFmsg
On Fri, Sep 18, 2015 at 06:11:05PM +0900, Tony Cho wrote: > This patch changes the name, strHostIFmsg simply to msg because the > camelcase notation is not recommended in Linux. > > Signed-off-by: Tony Cho Because of the other patches I didn't accept, and I think because of patches that community members sent in, this patch doesn't apply (patches 1 and 2 I had to do by hand, but I don't want to keep doing that...) So can you rebase this series on my staging-testing branch and resend them? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging/rtl8188eu/core/rtw_cmd.c comment fix
On Fri, Sep 18, 2015 at 01:41:07PM -0600, BryanSPaul wrote: > fix Block comments use * on subsequent lines That sentance makes no sense :( > Signed-off-by: Bryan Paul This name doesn't match the From: line :( thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: comedi: Fix coding style issues
On Fri, Sep 18, 2015 at 10:22:59PM +0530, Punit Vara wrote: > This patch is to comedidev.h file that fixes up following warnings > reported by checkpatch.pl : > > -Block comments use a trailing */ on a separate line > -Block comments use * on subsequent lines Your subject needs to be very specific, please fix up. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 2/4] staging: wilc1000: remove warnings on the multiple blank lines uses
On Thu, Sep 17, 2015 at 07:02:18PM +0900, Tony Cho wrote: > From: Leo Kim > > This patch removes the warnings reported by checkpatch.pl > for using multiple blank lines. > > Signed-off-by: Leo Kim > Signed-off-by: Tony Cho > --- > drivers/staging/wilc1000/wilc_wlan_if.h | 12 > 1 file changed, 12 deletions(-) Does not apply :( Neither did patches 3 and 4 in this series, please rebase and resend. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 1/4] staging: wilc1000: fix null check routine
On Thu, Sep 17, 2015 at 07:02:17PM +0900, Tony Cho wrote:
> From: Leo Kim
>
> This patch removes the potential faults which may happen when unexpectedly
> getting access to invalid pointer. The pointer of pstrWFIDrv is unlikely
> to be invalid. However, it is safer to return error when the invalid
> memory is unfortunately accessed.
>
> Signed-off-by: Leo Kim
> Signed-off-by: Tony Cho
> ---
> drivers/staging/wilc1000/host_interface.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/wilc1000/host_interface.c
> b/drivers/staging/wilc1000/host_interface.c
> index 6fdf392..151e8c4 100644
> --- a/drivers/staging/wilc1000/host_interface.c
> +++ b/drivers/staging/wilc1000/host_interface.c
> @@ -2403,8 +2403,10 @@ static s32 Handle_RcvdGnrlAsyncInfo(tstrWILC_WFIDrv
> *drvHandler, tstrRcvdGnrlAsy
> s32 s32Err = 0;
> tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler;
>
> - if (pstrWFIDrv == NULL)
> + if (unlikely(!pstrWFIDrv)) {
Can you measure the difference of using unlikely and not using it? If
not, never use it, as odds are, the compiler and processor already
guessed it correctly and made the code faster.
If you can measure it, great, I'll be glad to take this patch, but you
need to show your measurements in the changelog comments.
> PRINT_ER("Driver handler is NULL\n");
> + return -EFAULT;
-EFAULT is only for when we take a memory fault, which is not what is
happening here. -ENODEV?
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Apply Loan!
ALLIANCE & LEICESTER LOANS Do you need a loan? Arrangements to borrow up to £ 100,000,000.00, choose between 1 to 25 years repayment period, choose between monthly and annual repayment plan, flexible loan terms and conditions. All this plan and more by contacting us Dr. Richard Jose Head of Finance, ALLIANCE & LEICESTER PLC, Tel:+1-314 329-0172 --- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
