hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8712: Cleanup _io_ops wrappers 

This removes ugly and unnecessary declarations.

Signed-off-by: Mauro Dreissig <mukadr@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mauro Dreissig 2015-11-22 20:02:19 -02:00 committed by Greg Kroah-Hartman
parent 1d282c3100
commit 549d33d278
1 changed files with 22 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
drivers/staging/rtl8712/rtl8712_io.c
View File

@ -36,109 +36,76 @@
u8 r8712_read8(struct _adapter *adapter, u32 addr) u8 r8712_read8(struct _adapter *adapter, u32 addr)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr);
_read8 = pintfhdl->io_ops._read8; return hdl->io_ops._read8(hdl, addr);
return _read8(pintfhdl, addr);
} }
u16 r8712_read16(struct _adapter *adapter, u32 addr) u16 r8712_read16(struct _adapter *adapter, u32 addr)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr);
_read16 = pintfhdl->io_ops._read16; return hdl->io_ops._read16(hdl, addr);
return _read16(pintfhdl, addr);
} }
u32 r8712_read32(struct _adapter *adapter, u32 addr) u32 r8712_read32(struct _adapter *adapter, u32 addr)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
u32 (*_read32)(struct intf_hdl *pintfhdl, u32 addr);
_read32 = pintfhdl->io_ops._read32; return hdl->io_ops._read32(hdl, addr);
return _read32(pintfhdl, addr);
} }
void r8712_write8(struct _adapter *adapter, u32 addr, u8 val) void r8712_write8(struct _adapter *adapter, u32 addr, u8 val)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
void (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val);
_write8 = pintfhdl->io_ops._write8; hdl->io_ops._write8(hdl, addr, val);
_write8(pintfhdl, addr, val);
} }
void r8712_write16(struct _adapter *adapter, u32 addr, u16 val) void r8712_write16(struct _adapter *adapter, u32 addr, u16 val)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
void (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
_write16 = pintfhdl->io_ops._write16; hdl->io_ops._write16(hdl, addr, val);
_write16(pintfhdl, addr, val);
} }
void r8712_write32(struct _adapter *adapter, u32 addr, u32 val) void r8712_write32(struct _adapter *adapter, u32 addr, u32 val)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
void (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val); hdl->io_ops._write32(hdl, addr, val);
_write32 = pintfhdl->io_ops._write32;
_write32(pintfhdl, addr, val);
} }
void r8712_read_mem(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void r8712_read_mem(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
void (*_read_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
u8 *pmem);
if (adapter->bDriverStopped || adapter->bSurpriseRemoved) if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
return; return;
_read_mem = pintfhdl->io_ops._read_mem;
_read_mem(pintfhdl, addr, cnt, pmem); hdl->io_ops._read_mem(hdl, addr, cnt, pmem);
} }
void r8712_write_mem(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void r8712_write_mem(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
void (*_write_mem)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
u8 *pmem);
_write_mem = pintfhdl->io_ops._write_mem; hdl->io_ops._write_mem(hdl, addr, cnt, pmem);
_write_mem(pintfhdl, addr, cnt, pmem);
} }
void r8712_read_port(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void r8712_read_port(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
u32 (*_read_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
u8 *pmem);
if (adapter->bDriverStopped || adapter->bSurpriseRemoved) if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
return; return;
_read_port = pintfhdl->io_ops._read_port;
_read_port(pintfhdl, addr, cnt, pmem); hdl->io_ops._read_port(hdl, addr, cnt, pmem);
} }
void r8712_write_port(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem) void r8712_write_port(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
{ {
struct io_queue *pio_queue = adapter->pio_queue; struct intf_hdl *hdl = &adapter->pio_queue->intf;
struct intf_hdl *pintfhdl = &(pio_queue->intf);
u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, hdl->io_ops._write_port(hdl, addr, cnt, pmem);
u8 *pmem);
_write_port = pintfhdl->io_ops._write_port;
_write_port(pintfhdl, addr, cnt, pmem);
} }