3 files changed, 5 insertions, 9 deletions

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index 334b82a3542c..855ab3f5936f 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -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 = max(cycles, 800u); /* minimum as per the spec */
-        cycles = min(cycles, 3u * 8000u); /* maximum OHCI timeout */
+        /* minimum per IEEE 1394, maximum which doesn't overflow OHCI */
+        cycles = clamp(cycles, 800u, 3u * 8000u);
 
         card->split_timeout_cycles = cycles;
         card->split_timeout_jiffies = DIV_ROUND_UP(cycles * HZ, 8000);
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 03a7a85d0424..d1fad1fb17e2 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;
 }
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
index 8a8047db6980..68375bc3aef6 100644
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
@@ -1164,8 +1164,8 @@ static int sbp2_probe(struct device *dev)
          * specifies the max payload size as 2 ^ (max_payload + 2), so
          * 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 = min(tgt->max_payload, device->card->max_receive - 1);
+        tgt->max_payload = min3(device->max_speed + 7, 10U,
+                                device->card->max_receive - 1);
 
         /* Do the login in a workqueue so we can easily reschedule retries. */
         list_for_each_entry(lu, &tgt->lu_list, link)