Skip to content

Commit

Permalink
usb: ldusb: replace ternary operator with max_t()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiangshan Yi authored and Greg Kroah-Hartman committed Jul 14, 2022
1 parent 5e76ee9 commit efa2beb
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/usb/misc/ldusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit efa2beb

Please sign in to comment.