From: Yuesong Li Date: Thu, 19 Jun 2025 08:07:51 +0000 (+0800) Subject: staging: gpib: hp_82341: Replace manual comparison with min/max macro X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9adc643d43837a4af996af5511dab5a7b5a64315;p=users%2Fjedix%2Flinux-maple.git staging: gpib: hp_82341: Replace manual comparison with min/max macro This improves code readability by using the standard kernel macro for min/max value selection while maintaining identical functionality. Signed-off-by: Yuesong Li Link: https://lore.kernel.org/r/20250619080822.677662-1-liyuesong@vivo.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpib/hp_82341/hp_82341.c index 1b0822b2a3b8..e5c1997ce7d9 100644 --- a/drivers/staging/gpib/hp_82341/hp_82341.c +++ b/drivers/staging/gpib/hp_82341/hp_82341.c @@ -79,10 +79,7 @@ static int hp_82341_accel_read(struct gpib_board *board, u8 *buffer, size_t leng int j; int count; - if (num_fifo_bytes - i < hp_82341_fifo_size) - block_size = num_fifo_bytes - i; - else - block_size = hp_82341_fifo_size; + block_size = min(num_fifo_bytes - i, hp_82341_fifo_size); set_transfer_counter(hp_priv, block_size); outb(ENABLE_TI_BUFFER_BIT | DIRECTION_GPIB_TO_HOST_BIT, hp_priv->iobase[3] + BUFFER_CONTROL_REG); @@ -195,10 +192,7 @@ static int hp_82341_accel_write(struct gpib_board *board, u8 *buffer, size_t len for (i = 0; i < fifo_xfer_len;) { int block_size; - if (fifo_xfer_len - i < hp_82341_fifo_size) - block_size = fifo_xfer_len - i; - else - block_size = hp_82341_fifo_size; + block_size = min(fifo_xfer_len - i, hp_82341_fifo_size); set_transfer_counter(hp_priv, block_size); // load data into board's fifo for (j = 0; j < block_size;) {