Commit b67decf8 authored by Bryan Brattlof's avatar Bryan Brattlof Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove sd_f0_read8() 



The sd_f0_read8() function, which is used by the sdio_f0_read8()
function, are not used anywhere in the driver and both can be
safely removed.

Signed-off-by: default avatarBryan Brattlof <hello@bryanbrattlof.com>
Link: https://lore.kernel.org/r/20210524195144.1943280-1-hello@bryanbrattlof.com


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

drivers/staging/rtl8723bs/hal/sdio_ops.c

+0 −7
Original line number Diff line number Diff line
@@ -346,11 +346,6 @@ static s32 sdio_writeN(struct intf_hdl *intfhdl, u32 addr, u32 cnt, u8 *buf) 
	return err;

}



static u8 sdio_f0_read8(struct intf_hdl *intfhdl, u32 addr)

{

	return sd_f0_read8(intfhdl, addr, NULL);

}



static void sdio_read_mem(

	struct intf_hdl *intfhdl,

	u32 addr,
@@ -481,8 +476,6 @@ void sdio_set_intf_ops(struct adapter *adapter, struct _io_ops *ops) 
	ops->_writeN = &sdio_writeN;

	ops->_write_mem = &sdio_write_mem;

	ops->_write_port = &sdio_write_port;



	ops->_sd_f0_read8 = sdio_f0_read8;

}



/*

drivers/staging/rtl8723bs/include/rtw_io.h

+0 −2
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ struct _io_ops { 


		void (*_read_port_cancel)(struct intf_hdl *pintfhdl);

		void (*_write_port_cancel)(struct intf_hdl *pintfhdl);



		u8 (*_sd_f0_read8)(struct intf_hdl *pintfhdl, u32 addr);

};



struct io_req {

drivers/staging/rtl8723bs/include/sdio_ops_linux.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#define SDIO_ERR_VAL16	0xEAEA

#define SDIO_ERR_VAL32	0xEAEAEAEA



u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err);



s32 _sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata);

s32 _sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata);

s32 sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata);

drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c

+0 −28
Original line number Diff line number Diff line
@@ -26,34 +26,6 @@ inline void rtw_sdio_set_irq_thd(struct dvobj_priv *dvobj, void *thd_hdl) 
	sdio_data->sys_sdio_irq_thd = thd_hdl;

}



u8 sd_f0_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err)

{

	struct adapter *padapter;

	struct dvobj_priv *psdiodev;

	struct sdio_data *psdio;



	u8 v = 0;

	struct sdio_func *func;

	bool claim_needed;



	padapter = pintfhdl->padapter;

	psdiodev = pintfhdl->pintf_dev;

	psdio = &psdiodev->intf_data;



	if (padapter->bSurpriseRemoved)

		return v;



	func = psdio->func;

	claim_needed = rtw_sdio_claim_host_needed(func);



	if (claim_needed)

		sdio_claim_host(func);

	v = sdio_f0_readb(func, addr, err);

	if (claim_needed)

		sdio_release_host(func);

	return v;

}



/*

 * Return:

 *0		Success