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/p54 | |
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/p54')
-rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 6e635cfa24c8..b7ab3dfb3de8 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c | |||
@@ -513,7 +513,7 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev) | |||
513 | if (!buf) | 513 | if (!buf) |
514 | return -ENOMEM; | 514 | return -ENOMEM; |
515 | 515 | ||
516 | left = block_size = min((size_t)P54U_FW_BLOCK, priv->fw->size); | 516 | left = block_size = min_t(size_t, P54U_FW_BLOCK, priv->fw->size); |
517 | strcpy(buf, p54u_firmware_upload_3887); | 517 | strcpy(buf, p54u_firmware_upload_3887); |
518 | left -= strlen(p54u_firmware_upload_3887); | 518 | left -= strlen(p54u_firmware_upload_3887); |
519 | tmp += strlen(p54u_firmware_upload_3887); | 519 | tmp += strlen(p54u_firmware_upload_3887); |