Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

[cascardo/linux.git] / drivers / staging / rtl8188eu / core / rtw_io.c

diff --git a/drivers/staging/rtl8188eu/core/rtw_io.c b/drivers/staging/rtl8188eu/core/rtw_io.c
index ff0398f..7530532 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_io.c
+++ b/drivers/staging/rtl8188eu/core/rtw_io.c
@@ -59,10 +59,8 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr)
        struct  intf_hdl *pintfhdl = &(pio_priv->intf);
        u8 (*_read8)(struct intf_hdl *pintfhdl, u32 addr);
 
-       _func_enter_;
        _read8 = pintfhdl->io_ops._read8;
        r_val = _read8(pintfhdl, addr);
-       _func_exit_;
        return r_val;
 }
 
@@ -72,11 +70,9 @@ u16 _rtw_read16(struct adapter *adapter, u32 addr)
        struct io_priv *pio_priv = &adapter->iopriv;
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
        u16 (*_read16)(struct intf_hdl *pintfhdl, u32 addr);
-_func_enter_;
        _read16 = pintfhdl->io_ops._read16;
 
        r_val = _read16(pintfhdl, addr);
-_func_exit_;
        return r_val;
 }
 
@@ -86,11 +82,9 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr)
        struct io_priv *pio_priv = &adapter->iopriv;
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
        u32     (*_read32)(struct intf_hdl *pintfhdl, u32 addr);
-_func_enter_;
        _read32 = pintfhdl->io_ops._read32;
 
        r_val = _read32(pintfhdl, addr);
-_func_exit_;
        return r_val;
 }
 
@@ -100,11 +94,9 @@ int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
        int (*_write8)(struct intf_hdl *pintfhdl, u32 addr, u8 val);
        int ret;
-       _func_enter_;
        _write8 = pintfhdl->io_ops._write8;
 
        ret = _write8(pintfhdl, addr, val);
-       _func_exit_;
 
        return RTW_STATUS_CODE(ret);
 }
@@ -115,11 +107,9 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
        int (*_write16)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
        int ret;
-       _func_enter_;
        _write16 = pintfhdl->io_ops._write16;
 
        ret = _write16(pintfhdl, addr, val);
-       _func_exit_;
 
        return RTW_STATUS_CODE(ret);
 }
@@ -129,11 +119,9 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
        int (*_write32)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
        int ret;
-       _func_enter_;
        _write32 = pintfhdl->io_ops._write32;
 
        ret = _write32(pintfhdl, addr, val);
-       _func_exit_;
 
        return RTW_STATUS_CODE(ret);
 }
@@ -144,11 +132,9 @@ int _rtw_writeN(struct adapter *adapter, u32 addr , u32 length , u8 *pdata)
        struct  intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_priv->intf));
        int (*_writeN)(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata);
        int ret;
-       _func_enter_;
        _writeN = pintfhdl->io_ops._writeN;
 
        ret = _writeN(pintfhdl, addr, length, pdata);
-       _func_exit_;
 
        return RTW_STATUS_CODE(ret);
 }
@@ -158,11 +144,9 @@ int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
        int (*_write8_async)(struct intf_hdl *pintfhdl, u32 addr, u8 val);
        int ret;
-       _func_enter_;
        _write8_async = pintfhdl->io_ops._write8_async;
 
        ret = _write8_async(pintfhdl, addr, val);
-       _func_exit_;
 
        return RTW_STATUS_CODE(ret);
 }
@@ -174,10 +158,8 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)
        int (*_write16_async)(struct intf_hdl *pintfhdl, u32 addr, u16 val);
        int ret;
 
-_func_enter_;
        _write16_async = pintfhdl->io_ops._write16_async;
        ret = _write16_async(pintfhdl, addr, val);
-_func_exit_;
 
        return RTW_STATUS_CODE(ret);
 }
@@ -189,10 +171,8 @@ int _rtw_write32_async(struct adapter *adapter, u32 addr, u32 val)
        int (*_write32_async)(struct intf_hdl *pintfhdl, u32 addr, u32 val);
        int ret;
 
-_func_enter_;
        _write32_async = pintfhdl->io_ops._write32_async;
        ret = _write32_async(pintfhdl, addr, val);
-_func_exit_;
 
        return RTW_STATUS_CODE(ret);
 }
@@ -203,7 +183,6 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
        struct io_priv *pio_priv = &adapter->iopriv;
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
 
-       _func_enter_;
        if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
                RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
                         ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
@@ -212,7 +191,6 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
        }
        _read_mem = pintfhdl->io_ops._read_mem;
        _read_mem(pintfhdl, addr, cnt, pmem);
-       _func_exit_;
 }
 
 void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
@@ -221,13 +199,11 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
        struct io_priv *pio_priv = &adapter->iopriv;
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
 
-       _func_enter_;
 
        _write_mem = pintfhdl->io_ops._write_mem;
 
        _write_mem(pintfhdl, addr, cnt, pmem);
 
-       _func_exit_;
 }
 
 void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
@@ -236,7 +212,6 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
        struct io_priv *pio_priv = &adapter->iopriv;
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
 
-       _func_enter_;
 
        if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
                RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
@@ -249,7 +224,6 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 
        _read_port(pintfhdl, addr, cnt, pmem);
 
-       _func_exit_;
 }
 
 void _rtw_read_port_cancel(struct adapter *adapter)
@@ -271,13 +245,11 @@ u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
        struct  intf_hdl                *pintfhdl = &(pio_priv->intf);
        u32 ret = _SUCCESS;
 
-       _func_enter_;
 
        _write_port = pintfhdl->io_ops._write_port;
 
        ret = _write_port(pintfhdl, addr, cnt, pmem);
 
-        _func_exit_;
 
        return ret;
 }