diff options
Diffstat (limited to 'drivers/staging/rtl8723bs/hal/sdio_ops.c')
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/sdio_ops.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c index 3fee34484577..a60162046e5a 100644 --- a/drivers/staging/rtl8723bs/hal/sdio_ops.c +++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c @@ -425,12 +425,9 @@ static u32 sdio_read_port( ) { struct adapter *adapter; - PSDIO_DATA psdio; + struct sdio_data *psdio; struct hal_com_data *hal; u32 oldcnt; -#ifdef SDIO_DYNAMIC_ALLOC_MEM - u8 *oldmem; -#endif s32 err; @@ -447,13 +444,6 @@ static u32 sdio_read_port( err = _sd_read(intfhdl, addr, cnt, mem); -#ifdef SDIO_DYNAMIC_ALLOC_MEM - if ((oldcnt != cnt) && (oldmem)) { - memcpy(oldmem, mem, oldcnt); - kfree(mem); - } -#endif - if (err) return _FAIL; return _SUCCESS; @@ -483,7 +473,7 @@ static u32 sdio_write_port( ) { struct adapter *adapter; - PSDIO_DATA psdio; + struct sdio_data *psdio; s32 err; struct xmit_buf *xmitbuf = (struct xmit_buf *)mem; @@ -560,7 +550,7 @@ static s32 _sdio_local_read( n = RND4(cnt); tmpbuf = rtw_malloc(n); if (!tmpbuf) - return (-1); + return -1; err = _sd_read(intfhdl, addr, n, tmpbuf); if (!err) @@ -601,7 +591,7 @@ s32 sdio_local_read( n = RND4(cnt); tmpbuf = rtw_malloc(n); if (!tmpbuf) - return (-1); + return -1; err = sd_read(intfhdl, addr, n, tmpbuf); if (!err) @@ -646,7 +636,7 @@ s32 sdio_local_write( tmpbuf = rtw_malloc(cnt); if (!tmpbuf) - return (-1); + return -1; memcpy(tmpbuf, buf, cnt); @@ -1217,7 +1207,7 @@ u8 RecvOnePkt(struct adapter *adapter, u32 size) { struct recv_buf *recvbuf; struct dvobj_priv *sddev; - PSDIO_DATA psdio_data; + struct sdio_data *psdio; struct sdio_func *func; u8 res = false; |