lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: csr: remove CSRMIN() macro

Browse Source 
Use the in-kernel min_t() macro for the one place it was being used.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2012-10-26 17:11:23 -07:00
parent eaadf9a76e
commit d9ff393417
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/csr/csr_macro.h
View File

@@ -31,8 +31,6 @@
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Misc */ /* Misc */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
#define CSRMIN(a, b) (((a) < (b)) ? (a) : (b))
/* Use this macro on unused local variables that cannot be removed (such as /* Use this macro on unused local variables that cannot be removed (such as
unused function parameters). This will quell warnings from certain compilers unused function parameters). This will quell warnings from certain compilers
and static code analysis tools like Lint and Valgrind. */ and static code analysis tools like Lint and Valgrind. */

2
drivers/staging/csr/csr_wifi_hip_xbv.c
View File

@@ -758,7 +758,7 @@ static u32 write_fwdl_to_ptdl(void *buf, const u32 offset, fwreadfn_t readfn,
while (left) while (left)
{ {
/* Calculate amount to be transferred */ /* Calculate amount to be transferred */
sec_data_len = CSRMIN(left, PTDL_MAX_SIZE - PTDL_HDR_SIZE); sec_data_len = min_t(u32, left, PTDL_MAX_SIZE - PTDL_HDR_SIZE);
sec_len = sec_data_len + PTDL_HDR_SIZE; sec_len = sec_data_len + PTDL_HDR_SIZE;
/* Write PTDL header + entire PTDL size */ /* Write PTDL header + entire PTDL size */