Skip to content

Commit 2b0da1f

Browse files
omeridrissigregkh
authored andcommitted
staging: rtl8723bs: use direct returns in sdio_dvobj_init()
Make sdio_dvobj_init() use direct returns Signed-off-by: Omer El Idrissi <omer.e.idrissi@gmail.com> Signed-off-by: Omer El Idrissi <omer.e.idriss@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/20260326093607.13011-2-omer.e.idrissi@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6671dbb commit 2b0da1f

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

drivers/staging/rtl8723bs/os_dep/sdio_intf.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,12 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
155155
}
156156
static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
157157
{
158-
int status = _FAIL;
159158
struct dvobj_priv *dvobj = NULL;
160159
struct sdio_data *psdio;
161160

162161
dvobj = devobj_init();
163162
if (!dvobj)
164-
goto exit;
163+
return NULL;
165164

166165
sdio_set_drvdata(func, dvobj);
167166

@@ -172,18 +171,14 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
172171
goto free_dvobj;
173172

174173
rtw_reset_continual_io_error(dvobj);
175-
status = _SUCCESS;
176174

177-
free_dvobj:
178-
if (status != _SUCCESS && dvobj) {
179-
sdio_set_drvdata(func, NULL);
175+
return dvobj;
180176

181-
devobj_deinit(dvobj);
177+
free_dvobj:
178+
sdio_set_drvdata(func, NULL);
179+
devobj_deinit(dvobj);
182180

183-
dvobj = NULL;
184-
}
185-
exit:
186-
return dvobj;
181+
return NULL;
187182
}
188183

189184
static void sdio_dvobj_deinit(struct sdio_func *func)

0 commit comments

Comments
 (0)