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/cw1200 | |
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/cw1200')
-rw-r--r-- | drivers/net/wireless/cw1200/fwio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/cw1200/fwio.c b/drivers/net/wireless/cw1200/fwio.c index 5a9ffd3a6a6c..e23d67e0bfe6 100644 --- a/drivers/net/wireless/cw1200/fwio.c +++ b/drivers/net/wireless/cw1200/fwio.c | |||
@@ -202,8 +202,8 @@ static int cw1200_load_firmware_cw1200(struct cw1200_common *priv) | |||
202 | } | 202 | } |
203 | 203 | ||
204 | /* calculate the block size */ | 204 | /* calculate the block size */ |
205 | tx_size = block_size = min((size_t)(firmware->size - put), | 205 | tx_size = block_size = min_t(size_t, firmware->size - put, |
206 | (size_t)DOWNLOAD_BLOCK_SIZE); | 206 | DOWNLOAD_BLOCK_SIZE); |
207 | 207 | ||
208 | memcpy(buf, &firmware->data[put], block_size); | 208 | memcpy(buf, &firmware->data[put], block_size); |
209 | if (block_size < DOWNLOAD_BLOCK_SIZE) { | 209 | if (block_size < DOWNLOAD_BLOCK_SIZE) { |