Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d61f8e1e authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename strHostIfRemainOnChan of struct host_if_drv 



This patch renames strHostIfRemainOnChan of struct host_if_drv to remain_on_ch
to avoid CamelCase naming convention.
And, remove the relation comment.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8b17132

drivers/staging/wilc1000/host_interface.c

+12 −12
Original line number Diff line number Diff line
@@ -2477,13 +2477,13 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, 
	struct wid wid;



	if (!hif_drv->u8RemainOnChan_pendingreq) {

		hif_drv->strHostIfRemainOnChan.pVoid = pstrHostIfRemainOnChan->pVoid;

		hif_drv->strHostIfRemainOnChan.pRemainOnChanExpired = pstrHostIfRemainOnChan->pRemainOnChanExpired;

		hif_drv->strHostIfRemainOnChan.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady;

		hif_drv->strHostIfRemainOnChan.u16Channel = pstrHostIfRemainOnChan->u16Channel;

		hif_drv->strHostIfRemainOnChan.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID;

		hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;

		hif_drv->remain_on_ch.pRemainOnChanExpired = pstrHostIfRemainOnChan->pRemainOnChanExpired;

		hif_drv->remain_on_ch.pRemainOnChanReady = pstrHostIfRemainOnChan->pRemainOnChanReady;

		hif_drv->remain_on_ch.u16Channel = pstrHostIfRemainOnChan->u16Channel;

		hif_drv->remain_on_ch.u32ListenSessionID = pstrHostIfRemainOnChan->u32ListenSessionID;

	} else {

		pstrHostIfRemainOnChan->u16Channel = hif_drv->strHostIfRemainOnChan.u16Channel;

		pstrHostIfRemainOnChan->u16Channel = hif_drv->remain_on_ch.u16Channel;

	}



	if (hif_drv->usr_scan_req.pfUserScanResult) {
@@ -2532,8 +2532,8 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv, 
			  jiffies +

			  msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));



		if (hif_drv->strHostIfRemainOnChan.pRemainOnChanReady)

			hif_drv->strHostIfRemainOnChan.pRemainOnChanReady(hif_drv->strHostIfRemainOnChan.pVoid);

		if (hif_drv->remain_on_ch.pRemainOnChanReady)

			hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid);



		if (hif_drv->u8RemainOnChan_pendingreq)

			hif_drv->u8RemainOnChan_pendingreq = 0;
@@ -2605,9 +2605,9 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *hif_drv, 
			goto _done_;

		}



		if (hif_drv->strHostIfRemainOnChan.pRemainOnChanExpired) {

			hif_drv->strHostIfRemainOnChan.pRemainOnChanExpired(hif_drv->strHostIfRemainOnChan.pVoid

									       , pstrHostIfRemainOnChan->u32ListenSessionID);

		if (hif_drv->remain_on_ch.pRemainOnChanExpired) {

			hif_drv->remain_on_ch.pRemainOnChanExpired(hif_drv->remain_on_ch.pVoid,

								   pstrHostIfRemainOnChan->u32ListenSessionID);

		}

		P2P_LISTEN_STATE = 0;

	} else {
@@ -2630,7 +2630,7 @@ static void ListenTimerCB(unsigned long arg) 
	memset(&msg, 0, sizeof(struct host_if_msg));

	msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;

	msg.drv = hif_drv;

	msg.body.remain_on_ch.u32ListenSessionID = hif_drv->strHostIfRemainOnChan.u32ListenSessionID;

	msg.body.remain_on_ch.u32ListenSessionID = hif_drv->remain_on_ch.u32ListenSessionID;



	result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));

	if (result)

drivers/staging/wilc1000/host_interface.h

+1 −3
Original line number Diff line number Diff line
@@ -294,9 +294,7 @@ enum p2p_listen_state { 
struct host_if_drv {

	struct user_scan_req usr_scan_req;

	struct user_conn_req usr_conn_req;



	/*Remain on channel struvture*/

	struct remain_ch strHostIfRemainOnChan;

	struct remain_ch remain_on_ch;

	u8 u8RemainOnChan_pendingreq;

	u64 u64P2p_MgmtTimeout;

	u8 u8P2PConnect;