Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c754db40 authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Greg Kroah-Hartman
Browse files

Staging: rdma: Use min macro instead of ternary operator 



This patch replaces ternary operator with macro min as it shorter and
thus increases code readability. Macro min return the minimum of the
two compared values.
Made a semantic patch for changes:

@@
type T;
T x;
T y;
@@
(
- x < y ? x : y
+ min(x,y)
|
- x > y ? x : y
+ max(x,y)
)

Signed-off-by: default avatarBhumika Goyal <bhumirks@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 16ccad04

drivers/staging/rdma/hfi1/pio_copy.c

+3 −3
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static inline void read_extra_bytes(struct pio_buf *pbuf, 
	while (nbytes) {

		/* find the number of bytes in this u64 */

		room = 8 - off;	/* this u64 has room for this many bytes */

		xbytes = nbytes > room ? room : nbytes;

		xbytes = min(room, nbytes);



		/*

		 * shift down to zero lower bytes, shift up to zero upper
@@ -565,7 +565,7 @@ static void mid_copy_mix(struct pio_buf *pbuf, const void *from, size_t nbytes) 
		/* calculate the end of data or end of block, whichever

		   comes first */

		send = pbuf->start + PIO_BLOCK_SIZE;

		xend = send < dend ? send : dend;

		xend = min(send, dend);



		/* shift up to SOP=1 space */

		dest += SOP_DISTANCE;
@@ -659,7 +659,7 @@ static void mid_copy_straight(struct pio_buf *pbuf, 
		/* calculate the end of data or end of block, whichever

		   comes first */

		send = pbuf->start + PIO_BLOCK_SIZE;

		xend = send < dend ? send : dend;

		xend = min(send, dend);



		/* shift up to SOP=1 space */

		dest += SOP_DISTANCE;