usb: ldusb: replace ternary operator with max_t()
authorJiangshan Yi <yijiangshan@kylinos.cn>
Wed, 13 Jul 2022 07:02:05 +0000 (15:02 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Jul 2022 14:09:56 +0000 (16:09 +0200)
Fix the following coccicheck warning:

drivers/usb/misc/ldusb.c:719: WARNING opportunity for max().
drivers/usb/misc/ldusb.c:721: WARNING opportunity for max().

max_t() macro is defined in include/linux/minmax.h. It avoids
multiple evaluations of the arguments when non-constant and performs
strict type-checking.

Signed-off-by: Jiangshan Yi <yijiangshan@kylinos.cn>
Link: https://lore.kernel.org/r/20220713070205.3047256-1-13667453960@163.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/misc/ldusb.c

index dcc88df72df426705e351fa511809451b821cc11..7cbef74dfc9a95a7e1c3c2390a1e36ab76c52b41 100644 (file)
@@ -716,9 +716,11 @@ static int ld_usb_probe(struct usb_interface *intf, const struct usb_device_id *
        dev->interrupt_out_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!dev->interrupt_out_urb)
                goto error;
-       dev->interrupt_in_interval = min_interrupt_in_interval > dev->interrupt_in_endpoint->bInterval ? min_interrupt_in_interval : dev->interrupt_in_endpoint->bInterval;
+       dev->interrupt_in_interval = max_t(int, min_interrupt_in_interval,
+                                          dev->interrupt_in_endpoint->bInterval);
        if (dev->interrupt_out_endpoint)
-               dev->interrupt_out_interval = min_interrupt_out_interval > dev->interrupt_out_endpoint->bInterval ? min_interrupt_out_interval : dev->interrupt_out_endpoint->bInterval;
+               dev->interrupt_out_interval = max_t(int, min_interrupt_out_interval,
+                                                   dev->interrupt_out_endpoint->bInterval);
 
        /* we can register the device now, as it is ready */
        usb_set_intfdata(intf, dev);