From: Nishka Dasgupta Date: Mon, 24 Jun 2019 05:48:54 +0000 (+0530) Subject: staging: rtl8712: Change return values in r8712_init_cmd_priv() X-Git-Tag: microblaze-v5.4-rc1~333^2~147 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;ds=sidebyside;h=d91674322d1b9ae28b678d3683d522b56f1f367d;p=linux-2.6-microblaze.git staging: rtl8712: Change return values in r8712_init_cmd_priv() Change return values in r8712_init_cmd_priv from _SUCCESS/_FAIL to 0/-ENOMEM. Modify call site accordingly. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c index 1653b36c4bfd..ef9e9634b298 100644 --- a/drivers/staging/rtl8712/os_intfs.c +++ b/drivers/staging/rtl8712/os_intfs.c @@ -297,7 +297,7 @@ static u8 init_default_value(struct _adapter *padapter) u8 r8712_init_drv_sw(struct _adapter *padapter) { - if ((r8712_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) + if (r8712_init_cmd_priv(&padapter->cmdpriv)) return _FAIL; padapter->cmdpriv.padapter = padapter; if ((r8712_init_evt_priv(&padapter->evtpriv)) == _FAIL) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index c6643c371271..68efba177ab4 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -55,7 +55,7 @@ int r8712_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->cmd_allocated_buf = kmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ, GFP_ATOMIC); if (!pcmdpriv->cmd_allocated_buf) - return _FAIL; + return -ENOMEM; pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ((addr_t)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ - 1)); @@ -63,14 +63,14 @@ int r8712_init_cmd_priv(struct cmd_priv *pcmdpriv) if (!pcmdpriv->rsp_allocated_buf) { kfree(pcmdpriv->cmd_allocated_buf); pcmdpriv->cmd_allocated_buf = NULL; - return _FAIL; + return -ENOMEM; } pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 - ((addr_t)(pcmdpriv->rsp_allocated_buf) & 3); pcmdpriv->cmd_issued_cnt = 0; pcmdpriv->cmd_done_cnt = 0; pcmdpriv->rsp_cnt = 0; - return _SUCCESS; + return 0; } static sint _init_evt_priv(struct evt_priv *pevtpriv)