From 4ec4a67aa100268b4ac5ae32b54843d975969969 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 19 Sep 2011 00:20:48 +0200 Subject: 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 --- drivers/firewire/net.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'drivers/firewire/net.c') diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 03a7a85d042..d1fad1fb17e 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -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) { max_rec = min(max_rec, speed + 8); - max_rec = min(max_rec, 0xbU); /* <= 4096 */ - if (max_rec < 8) { - fw_notify("max_rec %x out of range\n", max_rec); - max_rec = 8; - } + max_rec = clamp(max_rec, 8U, 11U); /* 512...4096 */ return (1 << (max_rec + 1)) - RFC2374_FRAG_HDR_SIZE; } -- cgit v1.2.3-70-g09d2