UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rsi: remove unecessary PTR_ALIGN()s 

The issue here is that we allocate "data" and then set
"data = PTR_ALIGN(data, 8);" and then we free the aligned pointer
instead of the original pointer.

kmalloc() pointers are already ARCH_SLAB_MINALIGN aligned which is 8 or
more on everything except certain Xtensa variants.  We decided that if
the Xtensa people ever notice a bug here then we'll tell them the bug is
on their side.  ;)

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Dan Carpenter 2018-04-06 11:37:17 +03:00 committed by Kalle Valo
parent 4fd6c4762f
commit 350fcdb834
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/rsi/rsi_91x_sdio.c
View File

@ -660,8 +660,6 @@ static int rsi_sdio_master_reg_read(struct rsi_hw *adapter, u32 addr,
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
data = PTR_ALIGN(data, 8);
ms_addr = (addr >> 16); ms_addr = (addr >> 16);
status = rsi_sdio_master_access_msword(adapter, ms_addr); status = rsi_sdio_master_access_msword(adapter, ms_addr);
if (status < 0) { if (status < 0) {
@ -724,8 +722,6 @@ static int rsi_sdio_master_reg_write(struct rsi_hw *adapter,
if (!data_aligned) if (!data_aligned)
return -ENOMEM; return -ENOMEM;
data_aligned = PTR_ALIGN(data_aligned, 8);
if (size == 2) { if (size == 2) {
*data_aligned = ((data << 16) | (data & 0xFFFF)); *data_aligned = ((data << 16) | (data & 0xFFFF));
} else if (size == 1) { } else if (size == 1) {