usb: xhci: fix minmax.cocci warnings

Simplify the code using max().

Generated by: scripts/coccinelle/misc/minmax.cocci

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
Signed-off-by: Julia Lawall <julia.lawall@inria.fr>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20220216095153.1303105-10-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 7a2dce730e9a90e897dd54288c47070ced06a718..f8c2b6c79543780f37393ae69cf8b27aa0474abd 100644 (file)
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -433,8 +433,7 @@ int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,
                                (TRBS_PER_SEGMENT - 1);
 
        /* Allocate number of segments we needed, or double the ring size */
-       num_segs = ring->num_segs > num_segs_needed ?
-                       ring->num_segs : num_segs_needed;
+       num_segs = max(ring->num_segs, num_segs_needed);
 
        ret = xhci_alloc_segments_for_ring(xhci, &first, &last,
                        num_segs, ring->cycle_state, ring->type,