Skip to contentSkip to conversation

staging: gpib: Use min for calculating transfer length

PATCH New Dave Penkler 1 participant 1 message Jan 20, 2025 Staging

lore
Share & tools
lore

Dave Penkler

author
#0 lore raw

PATCH 1/1 staging: gpib: Use min for calculating transfer length

In the accel read and write functions the transfer length was being calculated by an if statement setting it to the lesser of the remaining bytes to read/write and the fifo size.

Replace both instances with min() which is clearer and more compact.

Reported-by kernel test robot <[email protected]>
Reported-by Julia Lawall <[email protected]>
Closes https://lore.kernel.org/r/[email protected]/ open here
Signed-off-by Dave Penkler <[email protected]>
---
 drivers/staging/gpib/agilent_82350b/agilent_82350b.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/staging/gpib/agilent_82350b/agilent_82350b.c +2 -8
index 3f4f95b7fe34..0ba592dc9849 100644
@@ -66,10 +66,7 @@ int agilent_82350b_accel_read(gpib_board_t *board, uint8_t *buffer, size_t lengt
 		int j;
 		int count;
 
-		if (num_fifo_bytes - i < agilent_82350b_fifo_size)
-			block_size = num_fifo_bytes - i;
-		else
-			block_size = agilent_82350b_fifo_size;
+		block_size = min(num_fifo_bytes - i, agilent_82350b_fifo_size);
 		set_transfer_counter(a_priv, block_size);
 		writeb(ENABLE_TI_TO_SRAM | DIRECTION_GPIB_TO_HOST,
 		       a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG);

@@ -200,10 +197,7 @@ int agilent_82350b_accel_write(gpib_board_t *board, uint8_t *buffer, size_t leng
 	for (i = 1; i < fifotransferlength;) {
 		clear_bit(WRITE_READY_BN, &tms_priv->state);
 
-		if (fifotransferlength - i < agilent_82350b_fifo_size)
-			block_size = fifotransferlength - i;
-		else
-			block_size = agilent_82350b_fifo_size;
+		block_size = min(fifotransferlength - i, agilent_82350b_fifo_size);
 		set_transfer_counter(a_priv, block_size);
 		for (j = 0; j < block_size; ++j, ++i) {
 			// load data into board's sram
Signature · 1 line
2.47.1