diff options
author | Silvan Jegen <s.jegen@gmail.com> | 2014-02-25 12:12:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-03 15:35:54 -0500 |
commit | c8e4955653a470ece7bf580c84fc88eb58cc9850 (patch) | |
tree | 0517b79659c4b4b0d83528dfc973d99c4de19770 /drivers/net/wireless/libertas | |
parent | 9ffd2e9a174769913dcce0fbc9223b58d2eb5526 (diff) |
net: Replace min macro with min_t
Instead of an explicit cast, use the min_t macro.
Signed-off-by: Silvan Jegen <s.jegen@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/if_sdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 58c6ee5de98f..33ceda296c9c 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
@@ -498,7 +498,7 @@ static int if_sdio_prog_helper(struct if_sdio_card *card, | |||
498 | */ | 498 | */ |
499 | mdelay(2); | 499 | mdelay(2); |
500 | 500 | ||
501 | chunk_size = min(size, (size_t)60); | 501 | chunk_size = min_t(size_t, size, 60); |
502 | 502 | ||
503 | *((__le32*)chunk_buffer) = cpu_to_le32(chunk_size); | 503 | *((__le32*)chunk_buffer) = cpu_to_le32(chunk_size); |
504 | memcpy(chunk_buffer + 4, firmware, chunk_size); | 504 | memcpy(chunk_buffer + 4, firmware, chunk_size); |
@@ -639,7 +639,7 @@ static int if_sdio_prog_real(struct if_sdio_card *card, | |||
639 | req_size = size; | 639 | req_size = size; |
640 | 640 | ||
641 | while (req_size) { | 641 | while (req_size) { |
642 | chunk_size = min(req_size, (size_t)512); | 642 | chunk_size = min_t(size_t, req_size, 512); |
643 | 643 | ||
644 | memcpy(chunk_buffer, firmware, chunk_size); | 644 | memcpy(chunk_buffer, firmware, chunk_size); |
645 | /* | 645 | /* |