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

drivers/usb/storage: 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-9-snovitoll@gmail.com


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

drivers/usb/storage/sddr09.c

+2 −2
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ sddr09_read_data(struct us_data *us, 
	// a bounce buffer and move the data a piece at a time between the

	// bounce buffer and the actual transfer buffer.



	len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;

	len = min_t(unsigned int, sectors, info->blocksize) * info->pagesize;

	buffer = kmalloc(len, GFP_NOIO);

	if (!buffer)

		return -ENOMEM;
@@ -997,7 +997,7 @@ sddr09_write_data(struct us_data *us, 
	 * at a time between the bounce buffer and the actual transfer buffer.

	 */



	len = min(sectors, (unsigned int) info->blocksize) * info->pagesize;

	len = min_t(unsigned int, sectors, info->blocksize) * info->pagesize;

	buffer = kmalloc(len, GFP_NOIO);

	if (!buffer) {

		kfree(blockbuffer);

drivers/usb/storage/sddr55.c

+4 −4
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int sddr55_read_data(struct us_data *us, 
	// a bounce buffer and move the data a piece at a time between the

	// bounce buffer and the actual transfer buffer.



	len = min((unsigned int) sectors, (unsigned int) info->blocksize >>

	len = min_t(unsigned int, sectors, info->blocksize >>

			info->smallpageshift) * PAGESIZE;

	buffer = kmalloc(len, GFP_NOIO);

	if (buffer == NULL)
@@ -224,7 +224,7 @@ static int sddr55_read_data(struct us_data *us, 


		// Read as many sectors as possible in this block



		pages = min((unsigned int) sectors << info->smallpageshift,

		pages = min_t(unsigned int, sectors << info->smallpageshift,

				info->blocksize - page);

		len = pages << info->pageshift;
@@ -333,7 +333,7 @@ static int sddr55_write_data(struct us_data *us, 
	// a bounce buffer and move the data a piece at a time between the

	// bounce buffer and the actual transfer buffer.



	len = min((unsigned int) sectors, (unsigned int) info->blocksize >>

	len = min_t(unsigned int, sectors, info->blocksize >>

			info->smallpageshift) * PAGESIZE;

	buffer = kmalloc(len, GFP_NOIO);

	if (buffer == NULL)
@@ -351,7 +351,7 @@ static int sddr55_write_data(struct us_data *us, 


		// Write as many sectors as possible in this block



		pages = min((unsigned int) sectors << info->smallpageshift,

		pages = min_t(unsigned int, sectors << info->smallpageshift,

				info->blocksize - page);

		len = pages << info->pageshift;