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

drivers/usb/gadget: refactor min with min_t 



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

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


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

drivers/usb/gadget/composite.c

+6 −6
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
					cdev->desc.bcdUSB = cpu_to_le16(0x0200);

			}



			value = min(w_length, (u16) sizeof cdev->desc);

			value = min_t(u16, w_length, sizeof(cdev->desc));

			memcpy(req->buf, &cdev->desc, value);

			break;

		case USB_DT_DEVICE_QUALIFIER:
@@ -1863,19 +1863,19 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
		case USB_DT_CONFIG:

			value = config_desc(cdev, w_value);

			if (value >= 0)

				value = min(w_length, (u16) value);

				value = min_t(u16, w_length, value);

			break;

		case USB_DT_STRING:

			value = get_string(cdev, req->buf,

					w_index, w_value & 0xff);

			if (value >= 0)

				value = min(w_length, (u16) value);

				value = min_t(u16, w_length, value);

			break;

		case USB_DT_BOS:

			if (gadget_is_superspeed(gadget) ||

			    gadget->lpm_capable || cdev->use_webusb) {

				value = bos_desc(cdev);

				value = min(w_length, (u16) value);

				value = min_t(u16, w_length, value);

			}

			break;

		case USB_DT_OTG:
@@ -1930,7 +1930,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
			*(u8 *)req->buf = cdev->config->bConfigurationValue;

		else

			*(u8 *)req->buf = 0;

		value = min(w_length, (u16) 1);

		value = min_t(u16, w_length, 1);

		break;



	/* function drivers must handle get/set altsetting */
@@ -1976,7 +1976,7 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
		if (value < 0)

			break;

		*((u8 *)req->buf) = value;

		value = min(w_length, (u16) 1);

		value = min_t(u16, w_length, 1);

		break;

	case USB_REQ_GET_STATUS:

		if (gadget_is_otg(gadget) && gadget->hnp_polling_support &&

drivers/usb/gadget/configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ static ssize_t os_desc_qw_sign_store(struct config_item *item, const char *page, 
	struct gadget_info *gi = os_desc_item_to_gadget_info(item);

	int res, l;



	l = min((int)len, OS_STRING_QW_SIGN_LEN >> 1);

	l = min_t(int, len, OS_STRING_QW_SIGN_LEN >> 1);

	if (page[l - 1] == '\n')

		--l;

drivers/usb/gadget/function/f_fs.c

+3 −3
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, 
		}



		/* FFS_SETUP_PENDING and not stall */

		len = min(len, (size_t)le16_to_cpu(ffs->ev.setup.wLength));

		len = min_t(size_t, len, le16_to_cpu(ffs->ev.setup.wLength));



		spin_unlock_irq(&ffs->ev.waitq.lock);
@@ -590,7 +590,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, 


		/* unlocks spinlock */

		return __ffs_ep0_read_events(ffs, buf,

					     min(n, (size_t)ffs->ev.count));

					     min_t(size_t, n, ffs->ev.count));



	case FFS_SETUP_PENDING:

		if (ffs->ev.setup.bRequestType & USB_DIR_IN) {
@@ -599,7 +599,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf, 
			goto done_mutex;

		}



		len = min(len, (size_t)le16_to_cpu(ffs->ev.setup.wLength));

		len = min_t(size_t, len, le16_to_cpu(ffs->ev.setup.wLength));



		spin_unlock_irq(&ffs->ev.waitq.lock);

drivers/usb/gadget/function/f_mass_storage.c

+4 −4
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int fsg_setup(struct usb_function *f, 
		*(u8 *)req->buf = _fsg_common_get_max_lun(fsg->common);



		/* Respond with data/status */

		req->length = min((u16)1, w_length);

		req->length = min_t(u16, 1, w_length);

		return ep0_queue(fsg->common);

	}
@@ -655,7 +655,7 @@ static int do_read(struct fsg_common *common) 
		 * And don't try to read past the end of the file.

		 */

		amount = min(amount_left, FSG_BUFLEN);

		amount = min((loff_t)amount,

		amount = min_t(loff_t, amount,

			     curlun->file_length - file_offset);



		/* Wait for the next buffer to become available */
@@ -1005,7 +1005,7 @@ static int do_verify(struct fsg_common *common) 
		 * And don't try to read past the end of the file.

		 */

		amount = min(amount_left, FSG_BUFLEN);

		amount = min((loff_t)amount,

		amount = min_t(loff_t, amount,

			     curlun->file_length - file_offset);

		if (amount == 0) {

			curlun->sense_data =
@@ -2167,7 +2167,7 @@ static int do_scsi_command(struct fsg_common *common) 
	if (reply == -EINVAL)

		reply = 0;		/* Error reply length */

	if (reply >= 0 && common->data_dir == DATA_DIR_TO_HOST) {

		reply = min((u32)reply, common->data_size_from_cmnd);

		reply = min_t(u32, reply, common->data_size_from_cmnd);

		bh->inreq->length = reply;

		bh->state = BUF_STATE_FULL;

		common->residue -= reply;

drivers/usb/gadget/function/uvc_video.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ uvc_video_encode_data(struct uvc_video *video, struct uvc_buffer *buf, 


	/* Copy video data to the USB buffer. */

	mem = buf->mem + queue->buf_used;

	nbytes = min((unsigned int)len, buf->bytesused - queue->buf_used);

	nbytes = min_t(unsigned int, len, buf->bytesused - queue->buf_used);



	memcpy(data, mem, nbytes);

	queue->buf_used += nbytes;
@@ -105,7 +105,7 @@ uvc_video_encode_bulk(struct usb_request *req, struct uvc_video *video, 
	}



	/* Process video data. */

	len = min((int)(video->max_payload_size - video->payload_size), len);

	len = min_t(int, video->max_payload_size - video->payload_size, len);

	ret = uvc_video_encode_data(video, buf, mem, len);



	video->payload_size += ret;