Commit efa2bebf authored by Jiangshan Yi's avatar Jiangshan Yi Committed by Greg Kroah-Hartman
Browse files

usb: ldusb: replace ternary operator with max_t() 



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: default avatarJiangshan Yi <yijiangshan@kylinos.cn>
Link: https://lore.kernel.org/r/20220713070205.3047256-1-13667453960@163.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e76ee96

drivers/usb/misc/ldusb.c

+4 −2
Original line number Diff line number Diff line
@@ -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);