From: Nishka Dasgupta Date: Fri, 21 Jun 2019 06:08:16 +0000 (+0530) Subject: staging: rtl8712: Replace function r8712_init_cmd_priv() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e39956c0d35efc36acbead9fc624a9ffd7d7ab82;p=linux.git staging: rtl8712: Replace function r8712_init_cmd_priv() Remove function r8712_init_cmd_priv as all it does is call _init_cmd_priv. Rename _init_cmd_priv to r8712_init_cmd_priv to maintain compatibility with call sites. Change type of new r8712_init_cmd_priv from static to non-static as original r8712_init_cmd_priv was non-static. Change return type of new r8712_init_cmd_priv to int as original had return type u32 but new (formerly _init_cmd_priv) had return type sint. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index 752418692be0c..c6643c3712716 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -43,7 +43,7 @@ * No irqsave is necessary. */ -static sint _init_cmd_priv(struct cmd_priv *pcmdpriv) +int r8712_init_cmd_priv(struct cmd_priv *pcmdpriv) { init_completion(&pcmdpriv->cmd_queue_comp); init_completion(&pcmdpriv->terminate_cmdthread_comp); @@ -135,11 +135,6 @@ static struct cmd_obj *_dequeue_cmd(struct __queue *queue) return obj; } -u32 r8712_init_cmd_priv(struct cmd_priv *pcmdpriv) -{ - return _init_cmd_priv(pcmdpriv); -} - u32 r8712_init_evt_priv(struct evt_priv *pevtpriv) { return _init_evt_priv(pevtpriv); diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h index efca88b4ea996..0203037adb7f8 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h @@ -84,7 +84,7 @@ void r8712_enqueue_cmd_ex(struct cmd_priv *pcmdpriv, struct cmd_obj *obj); struct cmd_obj *r8712_dequeue_cmd(struct __queue *queue); void r8712_free_cmd_obj(struct cmd_obj *pcmd); int r8712_cmd_thread(void *context); -u32 r8712_init_cmd_priv(struct cmd_priv *pcmdpriv); +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); void r8712_free_evt_priv(struct evt_priv *pevtpriv);