@@ -133,10 +133,10 @@ static const char * const jz4780_i2c_abrt_src[] = {
#define JZ4780_I2C_ENB_I2C BIT(0)
-#define JZ4780_I2CSHCNT_ADJUST(n) (((n) - 8) < 6 ? 6 : ((n) - 8))
-#define JZ4780_I2CSLCNT_ADJUST(n) (((n) - 1) < 8 ? 8 : ((n) - 1))
-#define JZ4780_I2CFHCNT_ADJUST(n) (((n) - 8) < 6 ? 6 : ((n) - 8))
-#define JZ4780_I2CFLCNT_ADJUST(n) (((n) - 1) < 8 ? 8 : ((n) - 1))
+#define JZ4780_I2CSHCNT_ADJUST(n) (max(6, (n) - 8))
+#define JZ4780_I2CSLCNT_ADJUST(n) (max(8, (n) - 1))
+#define JZ4780_I2CFHCNT_ADJUST(n) (max(6, (n) - 8))
+#define JZ4780_I2CFLCNT_ADJUST(n) (max(8, (n) - 1))
#define JZ4780_I2C_FIFO_LEN 16
#define TX_LEVEL 3
Replace ternary operators with macro 'max' as it is shorter and thus increases code readability. Macro max returns the maximum of the two compared values. Done using coccinelle: @@ type T; T x; T y; @@ ( - x < y ? x : y + min(x,y) | - x > y ? x : y + max(x,y) ) Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> --- drivers/i2c/busses/i2c-jz4780.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)