Commit 7088561c authored by Omer El Idrissi's avatar Omer El Idrissi Committed by Greg Kroah-Hartman
Browse files

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: default avatarOmer El Idrissi <omer.e.idrissi@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/20260326093607.13011-3-omer.e.idrissi@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b0da1fa

drivers/staging/rtl8723bs/os_dep/os_intfs.c

+4 −4
Original line number Diff line number Diff line
@@ -1135,9 +1135,9 @@ static int rtw_resume_process_normal(struct adapter *padapter) 
	pwrpriv = adapter_to_pwrctl(padapter);

	pmlmepriv = &padapter->mlmepriv;

	/*  interface init */

	/* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */

	if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) {

		ret = -1;

	if (padapter->intf_init) {

		ret = padapter->intf_init(adapter_to_dvobj(padapter));

		if (ret)

			goto exit;

	}

	rtw_hal_disable_interrupt(padapter);

drivers/staging/rtl8723bs/os_dep/sdio_intf.c

+4 −4
Original line number Diff line number Diff line
@@ -131,9 +131,7 @@ static u32 sdio_init(struct dvobj_priv *dvobj) 
release:

	sdio_release_host(func);



	if (err)

		return _FAIL;

	return _SUCCESS;

	return err;

}



static void sdio_deinit(struct dvobj_priv *dvobj)
@@ -157,6 +155,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func) 
{

	struct dvobj_priv *dvobj = NULL;

	struct sdio_data *psdio;

	int ret;



	dvobj = devobj_init();

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

	psdio->func = func;



	if (sdio_init(dvobj) != _SUCCESS)

	ret = sdio_init(dvobj);

	if (ret)

		goto free_dvobj;



	rtw_reset_continual_io_error(dvobj);