Skip to content

Commit 7088561

Browse files
omeridrissigregkh
authored andcommitted
staging: rtl8723bs: cleanup return in sdio_init()
Make sdio_init() return errno from sdio_enable_func or sdio_set_block_size instead of _SUCCESS/_FAIL vendor-defined macros. Let rtw_resume_process_normal return errno returned by sdio_init instead of -1. sdio_dvobj_init returns NULL on error so leave that as is. Let sdio_dvobj_init use a slightly more readable and conventional error check for sdio_init(). Signed-off-by: Omer El Idrissi <omer.e.idrissi@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/20260326093607.13011-3-omer.e.idrissi@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2b0da1f commit 7088561

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/staging/rtl8723bs/os_dep/os_intfs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,10 +1135,10 @@ static int rtw_resume_process_normal(struct adapter *padapter)
11351135
pwrpriv = adapter_to_pwrctl(padapter);
11361136
pmlmepriv = &padapter->mlmepriv;
11371137
/* interface init */
1138-
/* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */
1139-
if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) {
1140-
ret = -1;
1141-
goto exit;
1138+
if (padapter->intf_init) {
1139+
ret = padapter->intf_init(adapter_to_dvobj(padapter));
1140+
if (ret)
1141+
goto exit;
11421142
}
11431143
rtw_hal_disable_interrupt(padapter);
11441144
/* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */

drivers/staging/rtl8723bs/os_dep/sdio_intf.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ static u32 sdio_init(struct dvobj_priv *dvobj)
131131
release:
132132
sdio_release_host(func);
133133

134-
if (err)
135-
return _FAIL;
136-
return _SUCCESS;
134+
return err;
137135
}
138136

139137
static void sdio_deinit(struct dvobj_priv *dvobj)
@@ -157,6 +155,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
157155
{
158156
struct dvobj_priv *dvobj = NULL;
159157
struct sdio_data *psdio;
158+
int ret;
160159

161160
dvobj = devobj_init();
162161
if (!dvobj)
@@ -167,7 +166,8 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
167166
psdio = &dvobj->intf_data;
168167
psdio->func = func;
169168

170-
if (sdio_init(dvobj) != _SUCCESS)
169+
ret = sdio_init(dvobj);
170+
if (ret)
171171
goto free_dvobj;
172172

173173
rtw_reset_continual_io_error(dvobj);

0 commit comments

Comments
 (0)