From: Kang Hu <hukangustc@gmail.com>
Date: Thu, 31 Oct 2013 07:47:53 +0000 (-0700)
Subject: Input: remove a redundant max() call
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95079b8aa84015dc9032e42a1844dd78f76c3d2f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Input: remove a redundant max() call

dev->hint_events_per_packet is guaranteed to be >= packet_size.
so an extra max() call is not needed.

Signed-off-by: Kang Hu <hukangustc@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

diff --git a/drivers/input/input.c b/drivers/input/input.c
index c04469928925..fb513daa40f7 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -2048,7 +2048,7 @@ int input_register_device(struct input_dev *dev)
 	if (dev->hint_events_per_packet < packet_size)
 		dev->hint_events_per_packet = packet_size;
 
-	dev->max_vals = max(dev->hint_events_per_packet, packet_size) + 2;
+	dev->max_vals = dev->hint_events_per_packet + 2;
 	dev->vals = kcalloc(dev->max_vals, sizeof(*dev->vals), GFP_KERNEL);
 	if (!dev->vals) {
 		error = -ENOMEM;