Skip to contentSkip to conversation

Input: remove a redundant max() call.

PATCH Applied Kang Hu 2 participants 2 messages Oct 31, 2013

Subsystems (2)
lore
Share & tools
lore

Kang Hu

author
#0 lore raw

PATCH 1/1 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.

---
 drivers/input/input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/input.c +1 -1
index c044699..fb513da 100644
@@ -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;
Signature · 1 line
1.8.3.1
maintainer Applied
#1 lore raw
Quoted 2 lines · Kang Hu

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

Applied, thank you.

Quoted 22 lines
---
 drivers/input/input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/input.c +1 -1
index c044699..fb513da 100644
@@ -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;
Signature · 1 line
1.8.3.1
Signature · 1 line
Dmitry