diff options
| author | Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-06-24 11:18:55 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-26 10:00:08 +0800 |
| commit | 795eb36899ae697d898adc98d208b0bdb222d956 (patch) | |
| tree | b3747303d1594109a5fb9b447f9b94a464f77da5 | |
| parent | d91674322d1b9ae28b678d3683d522b56f1f367d (diff) | |
staging: rtl8712: Replace function r8712_init_evt_priv()
Remove function r8712_init_evt_priv as all it does is call
_init_evt_priv.
Rename _init_evt_priv to r8712_init_evt_priv to maintain compatibility
with call sites.
Change type of new r8712_init_evt_priv from static to non-static as
original r8712_init_evt_priv was non-static.
Change return type of new r8712_init_evt_priv to int as original had
return type u32 but new (formerly _init_evt_priv) had return type sint.
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_cmd.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_cmd.h | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index 68efba177ab4..baceb5dbf328 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -73,7 +73,7 @@ int r8712_init_cmd_priv(struct cmd_priv *pcmdpriv) return 0; } -static sint _init_evt_priv(struct evt_priv *pevtpriv) +int r8712_init_evt_priv(struct evt_priv *pevtpriv) { /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ pevtpriv->event_seq = 0; @@ -135,11 +135,6 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue) return obj; } -u32 r8712_init_evt_priv(struct evt_priv *pevtpriv) -{ - return _init_evt_priv(pevtpriv); -} - void r8712_free_evt_priv(struct evt_priv *pevtpriv) { _free_evt_priv(pevtpriv); diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h index 0203037adb7f..4ccd329ae7d5 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h @@ -86,7 +86,7 @@ void r8712_free_cmd_obj(struct cmd_obj *pcmd); int r8712_cmd_thread(void *context); int r8712_init_cmd_priv(struct cmd_priv *pcmdpriv); void r8712_free_cmd_priv(struct cmd_priv *pcmdpriv); -u32 r8712_init_evt_priv(struct evt_priv *pevtpriv); +int r8712_init_evt_priv(struct evt_priv *pevtpriv); void r8712_free_evt_priv(struct evt_priv *pevtpriv); enum rtl871x_drvint_cid { |