HID: hid-input: Simplify expression and suppress gcc warning

PATCH Applied James C Boyd 2 participants 6 messages May 27, 2015 – May 28, 2015 HID

lore

Share & tools

lore

James C Boyd

author

2015-05-27 22:09 UTC #0 lore raw

cover HID: hid-input: Simplify expression and suppress gcc warning

This patch set simplifies and formats an expression as well as suppress a gcc warning.

James C Boyd (3):
HID: hid-input: Add parenthesis to suppress gcc warning
HID: hid-input: Simplified conditional expression
HID: hid-input: Fix coding style issue

 drivers/hid/hid-input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

James C Boyd

author

2015-05-27 22:09 UTC #1 lore raw

PATCH 1/3 HID: hid-input: Add parentheses to quell gcc warning

GCC reports a -Wlogical-not-parentheses warning here; therefore add parentheses to shut it up and to express our intent more.

Signed-off-by James C Boyd <[email protected]>

---
 drivers/hid/hid-input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/hid/hid-input.c +1 -1

index 008e89b..714b758 100644
@@ -1157,7 +1157,7 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 		return;
 
 	/* report the usage code as scancode if the key status has changed */
-	if (usage->type == EV_KEY && !!test_bit(usage->code, input->key) != value)
+	if (usage->type == EV_KEY && (!!test_bit(usage->code, input->key)) != value)
 		input_event(input, EV_MSC, MSC_SCAN, usage->hid);
 
 	input_event(input, usage->type, usage->code, value);

James C Boyd

author

2015-05-27 22:09 UTC #2 lore raw

PATCH 2/3 HID: hid-input: Simplify conditional expression

In reply to James C Boyd

There are too many bangs in this conditional; therefore remove them while still maintaining the same logic.

Signed-off-by James C Boyd <[email protected]>

---
 drivers/hid/hid-input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/hid/hid-input.c +1 -1

index 714b758..abf4fc6 100644
@@ -1157,7 +1157,7 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 		return;
 
 	/* report the usage code as scancode if the key status has changed */
-	if (usage->type == EV_KEY && (!!test_bit(usage->code, input->key)) != value)
+	if (usage->type == EV_KEY && (!test_bit(usage->code, input->key)) == value)
 		input_event(input, EV_MSC, MSC_SCAN, usage->hid);
 
 	input_event(input, usage->type, usage->code, value);

James C Boyd

author

2015-05-27 22:09 UTC #3 lore raw

PATCH 3/3 HID: hid-input: Fix coding style issue

In reply to James C Boyd

This line is too long; split it up.

Signed-off-by James C Boyd <[email protected]>

---
 drivers/hid/hid-input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/hid/hid-input.c +2 -1

index abf4fc6..3511bbab 100644
@@ -1157,7 +1157,8 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 		return;
 
 	/* report the usage code as scancode if the key status has changed */
-	if (usage->type == EV_KEY && (!test_bit(usage->code, input->key)) == value)
+	if (usage->type == EV_KEY &&
+	    (!test_bit(usage->code, input->key)) == value)
 		input_event(input, EV_MSC, MSC_SCAN, usage->hid);
 
 	input_event(input, usage->type, usage->code, value);