Commit a05e885d authored by Sabyrzhan Tasbolatov's avatar Sabyrzhan Tasbolatov Committed by Greg Kroah-Hartman
Browse files

drivers/usb/musb: refactor min/max with min_t/max_t 



Ensure type safety by using min_t()/max_t() instead of casted min()/max().

Signed-off-by: default avatarSabyrzhan Tasbolatov <snovitoll@gmail.com>
Link: https://lore.kernel.org/r/20241112155817.3512577-7-snovitoll@gmail.com


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

drivers/usb/musb/musb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1387,7 +1387,7 @@ fifo_setup(struct musb *musb, struct musb_hw_ep *hw_ep, 


	/* expect hw_ep has already been zero-initialized */



	size = ffs(max(maxpacket, (u16) 8)) - 1;

	size = ffs(max_t(u16, maxpacket, 8)) - 1;

	maxpacket = 1 << size;



	c_size = size - 3;

drivers/usb/musb/musb_gadget_ep0.c

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ static void ep0_txstate(struct musb *musb) 


	/* load the data */

	fifo_src = (u8 *) request->buf + request->actual;

	fifo_count = min((unsigned) MUSB_EP0_FIFOSIZE,

	fifo_count = min_t(unsigned, MUSB_EP0_FIFOSIZE,

		request->length - request->actual);

	musb_write_fifo(&musb->endpoints[0], fifo_count, fifo_src);

	request->actual += fifo_count;

drivers/usb/musb/musb_host.c

+2 −3
Original line number Diff line number Diff line
@@ -798,10 +798,9 @@ static void musb_ep_program(struct musb *musb, u8 epnum, 
		}



		if (can_bulk_split(musb, qh->type))

			load_count = min((u32) hw_ep->max_packet_sz_tx,

						len);

			load_count = min_t(u32, hw_ep->max_packet_sz_tx, len);

		else

			load_count = min((u32) packet_sz, len);

			load_count = min_t(u32, packet_sz, len);



		if (dma_channel && musb_tx_dma_program(dma_controller,

					hw_ep, qh, urb, offset, len))