Commit 06c38fef authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove core/rtw_io.c 



There are only unused functions and macros and one function which can be
open-coded.

So, removed core/rtw_io.c at all, removed core/rtw_io.c from Makefile
and open-coded rtw_init_io_priv

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Co-developed-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Link: https://lore.kernel.org/r/20210917071837.10926-14-fmdefrancesco@gmail.com


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

drivers/staging/r8188eu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ rtk_core := \ 
		core/rtw_debug.o	\

		core/rtw_efuse.o	\

		core/rtw_ieee80211.o	\

		core/rtw_io.o		\

		core/rtw_ioctl_set.o	\

		core/rtw_iol.o		\

		core/rtw_led.o		\

drivers/staging/r8188eu/core/rtw_io.c

deleted100644 → 0
+0 −111
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Copyright(c) 2007 - 2011 Realtek Corporation. */



/*



The purpose of rtw_io.c



a. provides the API



b. provides the protocol engine



c. provides the software interface between caller and the hardware interface



Compiler Flag Option:



USB:

   a. USE_ASYNC_IRP: Both sync/async operations are provided.



Only sync read/rtw_write_mem operations are provided.



jackson@realtek.com.tw



*/



#define _RTW_IO_C_

#include "../include/osdep_service.h"

#include "../include/drv_types.h"

#include "../include/rtw_io.h"

#include "../include/osdep_intf.h"

#include "../include/usb_ops.h"



#define rtw_le16_to_cpu(val)		le16_to_cpu(val)

#define rtw_le32_to_cpu(val)		le32_to_cpu(val)

#define rtw_cpu_to_le16(val)		cpu_to_le16(val)

#define rtw_cpu_to_le32(val)		cpu_to_le32(val)



int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct	intf_hdl		*pintfhdl = &pio_priv->intf;

	int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val);

	int ret;



	_write8_async = pintfhdl->io_ops._write8_async;



	ret = _write8_async(pintfhdl, addr, val);





	return RTW_STATUS_CODE(ret);

}



int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct	intf_hdl		*pintfhdl = &pio_priv->intf;

	int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val);

	int ret;



	_write16_async = pintfhdl->io_ops._write16_async;

	ret = _write16_async(pintfhdl, addr, val);



	return RTW_STATUS_CODE(ret);

}



int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)

{

	struct io_priv *pio_priv = &adapter->iopriv;

	struct	intf_hdl		*pintfhdl = &pio_priv->intf;

	int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val);

	int ret;



	_write32_async = pintfhdl->io_ops._write32_async;

	ret = _write32_async(pintfhdl, addr, val);



	return RTW_STATUS_CODE(ret);

}





u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem, int timeout_ms)

{

	int ret = _SUCCESS;

	struct xmit_buf *pxmitbuf = (struct xmit_buf *)pmem;

	struct submit_ctx sctx;



	rtw_sctx_init(&sctx, timeout_ms);

	pxmitbuf->sctx = &sctx;



	ret = rtw_write_port(adapter, addr, cnt, pmem);



	if (ret == _SUCCESS)

		ret = rtw_sctx_wait(&sctx);



	return ret;

}



int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct _io_ops *pops))

{

	struct io_priv	*piopriv = &padapter->iopriv;

	struct intf_hdl *pintf = &piopriv->intf;



	if (!set_intf_ops)

		return _FAIL;



	piopriv->padapter = padapter;

	pintf->padapter = padapter;

	pintf->pintf_dev = adapter_to_dvobj(padapter);



	set_intf_ops(&pintf->io_ops);



	return _SUCCESS;

}

drivers/staging/r8188eu/include/rtw_io.h

+1 −18
Original line number Diff line number Diff line
@@ -257,25 +257,11 @@ int rtw_write16(struct adapter *adapter, u32 addr, u16 val); 
int rtw_write32(struct adapter *adapter, u32 addr, u32 val);

int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata);



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

int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val);

int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val);



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

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

u32 _rtw_write_port_and_wait(struct adapter *adapter, u32 addr, u32 cnt,

			     u8 *pmem, int timeout_ms);

void rtw_write_port_cancel(struct adapter *adapter);





#define rtw_write8_async(adapter, addr, val)				\

	_rtw_write8_async((adapter), (addr), (val))

#define rtw_write16_async(adapter, addr, val)				\

	_rtw_write16_async((adapter), (addr), (val))

#define rtw_write32_async(adapter, addr, val)				\

	_rtw_write32_async((adapter), (addr), (val))

#define rtw_write_port_and_wait(adapter, addr, cnt, mem, timeout_ms)	\

	_rtw_write_port_and_wait((adapter), (addr), (cnt), (mem), (timeout_ms))

void rtw_write_scsi(struct adapter *adapter, u32 cnt, u8 *pmem);



/* ioreq */

void ioreq_read8(struct adapter *adapter, u32 addr, u8 *pval);
@@ -317,9 +303,6 @@ void async_write32(struct adapter *adapter, u32 addr, u32 val, 
void async_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

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



int rtw_init_io_priv(struct adapter *padapter,

		     void (*set_intf_ops)(struct _io_ops *pops));



uint alloc_io_queue(struct adapter *adapter);

void free_io_queue(struct adapter *adapter);

void async_bus_io(struct io_queue *pio_q);

drivers/staging/r8188eu/os_dep/usb_intf.c

+7 −1
Original line number Diff line number Diff line
@@ -448,6 +448,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 
	struct adapter *padapter = NULL;

	struct net_device *pnetdev = NULL;

	int status = _FAIL;

	struct io_priv *piopriv;

	struct intf_hdl *pintf;



	padapter = vzalloc(sizeof(*padapter));

	if (!padapter)
@@ -479,7 +481,11 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, 
	padapter->intf_stop = &usb_intf_stop;



	/* step init_io_priv */

	rtw_init_io_priv(padapter, usb_set_intf_ops);

	piopriv = &padapter->iopriv;

	pintf = &piopriv->intf;

	piopriv->padapter = padapter;

	pintf->padapter = padapter;

	pintf->pintf_dev = adapter_to_dvobj(padapter);



	/* step read_chip_version */

	rtl8188e_read_chip_version(padapter);