firewire: use clamp and min3 macros
Use kernel.h's convenience macros. Also omit a printk that should never happen and won't matter much if it ever happened. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
parent
b810e4ae11
commit
4ec4a67aa1
|
@ -1046,8 +1046,8 @@ static void update_split_timeout(struct fw_card *card)
|
||||||
|
|
||||||
cycles = card->split_timeout_hi * 8000 + (card->split_timeout_lo >> 19);
|
cycles = card->split_timeout_hi * 8000 + (card->split_timeout_lo >> 19);
|
||||||
|
|
||||||
cycles = max(cycles, 800u); /* minimum as per the spec */
|
/* minimum per IEEE 1394, maximum which doesn't overflow OHCI */
|
||||||
cycles = min(cycles, 3u * 8000u); /* maximum OHCI timeout */
|
cycles = clamp(cycles, 800u, 3u * 8000u);
|
||||||
|
|
||||||
card->split_timeout_cycles = cycles;
|
card->split_timeout_cycles = cycles;
|
||||||
card->split_timeout_jiffies = DIV_ROUND_UP(cycles * HZ, 8000);
|
card->split_timeout_jiffies = DIV_ROUND_UP(cycles * HZ, 8000);
|
||||||
|
|
|
@ -502,11 +502,7 @@ static struct fwnet_peer *fwnet_peer_find_by_node_id(struct fwnet_device *dev,
|
||||||
static unsigned fwnet_max_payload(unsigned max_rec, unsigned speed)
|
static unsigned fwnet_max_payload(unsigned max_rec, unsigned speed)
|
||||||
{
|
{
|
||||||
max_rec = min(max_rec, speed + 8);
|
max_rec = min(max_rec, speed + 8);
|
||||||
max_rec = min(max_rec, 0xbU); /* <= 4096 */
|
max_rec = clamp(max_rec, 8U, 11U); /* 512...4096 */
|
||||||
if (max_rec < 8) {
|
|
||||||
fw_notify("max_rec %x out of range\n", max_rec);
|
|
||||||
max_rec = 8;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (1 << (max_rec + 1)) - RFC2374_FRAG_HDR_SIZE;
|
return (1 << (max_rec + 1)) - RFC2374_FRAG_HDR_SIZE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1164,8 +1164,8 @@ static int sbp2_probe(struct device *dev)
|
||||||
* specifies the max payload size as 2 ^ (max_payload + 2), so
|
* specifies the max payload size as 2 ^ (max_payload + 2), so
|
||||||
* if we set this to max_speed + 7, we get the right value.
|
* if we set this to max_speed + 7, we get the right value.
|
||||||
*/
|
*/
|
||||||
tgt->max_payload = min(device->max_speed + 7, 10U);
|
tgt->max_payload = min3(device->max_speed + 7, 10U,
|
||||||
tgt->max_payload = min(tgt->max_payload, device->card->max_receive - 1);
|
device->card->max_receive - 1);
|
||||||
|
|
||||||
/* Do the login in a workqueue so we can easily reschedule retries. */
|
/* Do the login in a workqueue so we can easily reschedule retries. */
|
||||||
list_for_each_entry(lu, &tgt->lu_list, link)
|
list_for_each_entry(lu, &tgt->lu_list, link)
|
||||||
|
|
Loading…
Reference in a new issue