microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

staging: wilc1000: rename pVoid of struct remain_ch 

This patch renames pVoid of struct remain_ch to arg
to avoid CamelCase naming convention.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Leo Kim 2015-10-29 11:58:44 +09:00 коммит произвёл Greg Kroah-Hartman
Родитель 5e5f7916b3
Коммит c5cc4b1264
2 изменённых файлов: 5 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
drivers/staging/wilc1000/host_interface.c
Просмотреть файл

@ -2480,7 +2480,7 @@ static int Handle_RemainOnChan(struct host_if_drv *hif_drv,
struct wid wid; struct wid wid;
if (!hif_drv->remain_on_ch_pending) { if (!hif_drv->remain_on_ch_pending) {
hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid; hif_drv->remain_on_ch.arg = pstrHostIfRemainOnChan->arg;
hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired; hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready; hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch; hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
@ -2537,7 +2537,7 @@ ERRORHANDLER:
msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration)); msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));
if (hif_drv->remain_on_ch.ready) if (hif_drv->remain_on_ch.ready)
hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.pVoid); hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.arg);
if (hif_drv->remain_on_ch_pending) if (hif_drv->remain_on_ch_pending)
hif_drv->remain_on_ch_pending = 0; hif_drv->remain_on_ch_pending = 0;
@ -2611,7 +2611,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv *hif_drv,
} }
if (hif_drv->remain_on_ch.expired) { if (hif_drv->remain_on_ch.expired) {
hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.pVoid, hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg,
pstrHostIfRemainOnChan->u32ListenSessionID); pstrHostIfRemainOnChan->u32ListenSessionID);
} }
P2P_LISTEN_STATE = 0; P2P_LISTEN_STATE = 0;
@ -4371,7 +4371,7 @@ s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID,
msg.body.remain_on_ch.ch = chan; msg.body.remain_on_ch.ch = chan;
msg.body.remain_on_ch.expired = RemainOnChanExpired; msg.body.remain_on_ch.expired = RemainOnChanExpired;
msg.body.remain_on_ch.ready = RemainOnChanReady; msg.body.remain_on_ch.ready = RemainOnChanReady;
msg.body.remain_on_ch.pVoid = pvUserArg; msg.body.remain_on_ch.arg = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration; msg.body.remain_on_ch.u32duration = u32duration;
msg.body.remain_on_ch.u32ListenSessionID = u32SessionID; msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
msg.drv = hif_drv; msg.drv = hif_drv;

2
drivers/staging/wilc1000/host_interface.h
Просмотреть файл

@ -240,7 +240,7 @@ struct remain_ch {
u32 u32duration; u32 u32duration;
wilc_remain_on_chan_expired expired; wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready ready; wilc_remain_on_chan_ready ready;
void *pVoid; void *arg;
u32 u32ListenSessionID; u32 u32ListenSessionID;
}; };