summaryrefslogtreecommitdiffstats
path: root/drivers/staging/fbtft/fbtft-bus.c
diff options
context:
space:
mode:
authorAlison Schofield2016-02-24 18:20:17 +0100
committerGreg Kroah-Hartman2016-03-12 07:09:09 +0100
commit3589d3c9e39889fcac8fa0cb9f5bb3006d7d0d51 (patch)
tree592a1ef9d23a51fc7aa4913731791e6613e35644 /drivers/staging/fbtft/fbtft-bus.c
parentstaging: fbtft: Use kmalloc_array (diff)
downloadkernel-qcow2-linux-3589d3c9e39889fcac8fa0cb9f5bb3006d7d0d51.tar.gz
kernel-qcow2-linux-3589d3c9e39889fcac8fa0cb9f5bb3006d7d0d51.tar.xz
kernel-qcow2-linux-3589d3c9e39889fcac8fa0cb9f5bb3006d7d0d51.zip
staging: fbtft: replace ternary operator with min macro
Use macro min() to get the minimum of two values for brevity and readability. Found 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: Alison Schofield <amsfield22@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fbtft/fbtft-bus.c')
-rw-r--r--drivers/staging/fbtft/fbtft-bus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/fbtft/fbtft-bus.c b/drivers/staging/fbtft/fbtft-bus.c
index 58449ad84f46..b31f1114c907 100644
--- a/drivers/staging/fbtft/fbtft-bus.c
+++ b/drivers/staging/fbtft/fbtft-bus.c
@@ -157,7 +157,7 @@ int fbtft_write_vmem16_bus8(struct fbtft_par *par, size_t offset, size_t len)
}
while (remain) {
- to_copy = remain > tx_array_size ? tx_array_size : remain;
+ to_copy = min(tx_array_size, remain);
dev_dbg(par->info->device, " to_copy=%zu, remain=%zu\n",
to_copy, remain - to_copy);
@@ -201,7 +201,7 @@ int fbtft_write_vmem16_bus9(struct fbtft_par *par, size_t offset, size_t len)
tx_array_size = par->txbuf.len / 2;
while (remain) {
- to_copy = remain > tx_array_size ? tx_array_size : remain;
+ to_copy = min(tx_array_size, remain);
dev_dbg(par->info->device, " to_copy=%zu, remain=%zu\n",
to_copy, remain - to_copy);