Commit e81ffd89 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Remove function _rtw_read_port_cancel() 



_rtw_read_port_cancel() is a wrapper function, being used to call
usb_read_port_cancel().
Call usb_read_port_cancel() directly and drop _rtw_read_port_cancel().

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2478a1ce

drivers/staging/rtl8188eu/core/rtw_io.c

+0 −12
Original line number Diff line number Diff line
@@ -126,18 +126,6 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val) 
	return RTW_STATUS_CODE(ret);

}



void _rtw_read_port_cancel(struct adapter *adapter)

{

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

	struct io_priv *pio_priv = &adapter->iopriv;

	struct intf_hdl *pintfhdl = &(pio_priv->intf);



	_read_port_cancel = pintfhdl->io_ops._read_port_cancel;



	if (_read_port_cancel)

		_read_port_cancel(adapter);

}



u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)

{

	u32 (*_write_port)(struct adapter *pintfhdl, u32 addr, u32 cnt, u8 *pmem);

drivers/staging/rtl8188eu/hal/usb_halinit.c

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter) 
{

	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("\n ===> usb_rx_deinit\n"));



	rtw_read_port_cancel(Adapter);

	usb_read_port_cancel(Adapter);



	RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("\n <=== usb_rx_deinit\n"));

drivers/staging/rtl8188eu/hal/usb_ops_linux.c

+0 −1
Original line number Diff line number Diff line
@@ -673,6 +673,5 @@ void rtl8188eu_set_intf_ops(struct _io_ops *pops) 
	pops->_write16 = &usb_write16;

	pops->_write32 = &usb_write32;

	pops->_write_port = &usb_write_port;

	pops->_read_port_cancel = &usb_read_port_cancel;

	pops->_write_port_cancel = &usb_write_port_cancel;

}

drivers/staging/rtl8188eu/include/rtw_io.h

+1 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ struct _io_ops { 
	int (*_write32)(struct adapter *pintfhdl, u32 addr, u32 val);

	u32 (*_write_port)(struct adapter *pintfhdl, u32 addr, u32 cnt,

			   u8 *pmem);

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

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

};
@@ -89,7 +88,7 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr); 
u16 _rtw_read16(struct adapter *adapter, u32 addr);

u32 _rtw_read32(struct adapter *adapter, u32 addr);

u32 usb_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

void _rtw_read_port_cancel(struct adapter *adapter);

void usb_read_port_cancel(struct adapter *adapter);



int _rtw_write8(struct adapter *adapter, u32 addr, u8 val);

int _rtw_write16(struct adapter *adapter, u32 addr, u16 val);
@@ -102,7 +101,6 @@ void _rtw_write_port_cancel(struct adapter *adapter); 
#define rtw_read8(adapter, addr) _rtw_read8((adapter), (addr))

#define rtw_read16(adapter, addr) _rtw_read16((adapter), (addr))

#define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr))

#define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter))



#define  rtw_write8(adapter, addr, val)					\

	_rtw_write8((adapter), (addr), (val))