mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 14:40:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: wilc1000: make use of ALIGN macro

Browse Source 
Make use of 'ALIGN' macro to align the size data value.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Link: https://lore.kernel.org/r/20200214172250.13026-5-ajay.kathat@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh
2020-02-14 11:52:18 +00:00
committed by Greg Kroah-Hartman
parent eda308be64
commit bf13984d51
2 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/wilc1000/sdio.c
View File

@@ -415,28 +415,12 @@ static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.read_write = 1;
if (addr > 0) {
/**
* has to be word aligned...
**/
if (size & 0x3) {
size += 4;
size &= ~0x3;
}
/**
* func 0 access
**/
cmd.function = 0;
cmd.address = 0x10f;
} else {
/**
* has to be word aligned...
**/
if (size & 0x3) {
size += 4;
size &= ~0x3;
}
/**
* func 1 access
**/
@@ -444,6 +428,7 @@ static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.address = 0;
}
size = ALIGN(size, 4);
nblk = size / block_size;
nleft = size % block_size;
@@ -551,28 +536,12 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.read_write = 0;
if (addr > 0) {
/**
* has to be word aligned...
**/
if (size & 0x3) {
size += 4;
size &= ~0x3;
}
/**
* func 0 access
**/
cmd.function = 0;
cmd.address = 0x10f;
} else {
/**
* has to be word aligned...
**/
if (size & 0x3) {
size += 4;
size &= ~0x3;
}
/**
* func 1 access
**/
@@ -580,6 +549,7 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
cmd.address = 0;
}
size = ALIGN(size, 4);
nblk = size / block_size;
nleft = size % block_size;

4
drivers/staging/wilc1000/wlan.c
View File

@@ -508,9 +508,7 @@ int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
vmm_sz = HOST_HDR_OFFSET;
vmm_sz += tqe->buffer_size;
if (vmm_sz & 0x3)
vmm_sz = (vmm_sz + 4) & ~0x3;
vmm_sz = ALIGN(vmm_sz, 4);
if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE)
break;