aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/csr
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-26 17:11:23 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-26 17:11:23 -0700
commitd9ff3934171b5cf1ac17e5fcd39f3f324b4724ce (patch)
treefe5c4779c0f78ca182080a4c0f7a6e000299dd9f /drivers/staging/csr
parenteaadf9a76e80b00dfac31ee7ee0a5ca8fb284baf (diff)
downloadlinaro-lsk-d9ff3934171b5cf1ac17e5fcd39f3f324b4724ce.tar.gz
Staging: csr: remove CSRMIN() macro
Use the in-kernel min_t() macro for the one place it was being used. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr')
-rw-r--r--drivers/staging/csr/csr_macro.h2
-rw-r--r--drivers/staging/csr/csr_wifi_hip_xbv.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h
index d78ac51dacc..c47f1d91b6f 100644
--- a/drivers/staging/csr/csr_macro.h
+++ b/drivers/staging/csr/csr_macro.h
@@ -31,8 +31,6 @@
/*------------------------------------------------------------------*/
/* Misc */
/*------------------------------------------------------------------*/
-#define CSRMIN(a, b) (((a) < (b)) ? (a) : (b))
-
/* Use this macro on unused local variables that cannot be removed (such as
unused function parameters). This will quell warnings from certain compilers
and static code analysis tools like Lint and Valgrind. */
diff --git a/drivers/staging/csr/csr_wifi_hip_xbv.c b/drivers/staging/csr/csr_wifi_hip_xbv.c
index 071f80a49f1..050a15fbadf 100644
--- a/drivers/staging/csr/csr_wifi_hip_xbv.c
+++ b/drivers/staging/csr/csr_wifi_hip_xbv.c
@@ -758,7 +758,7 @@ static u32 write_fwdl_to_ptdl(void *buf, const u32 offset, fwreadfn_t readfn,
while (left)
{
/* 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;
/* Write PTDL header + entire PTDL size */