aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2021-12-10 13:11:34 +0200
committerBenjamin Tissoires <benjamin.tissoires@redhat.com>2021-12-14 10:05:39 +0100
commit8aa45b544db9788b0fcc7a300eba8a3ade5d3d50 (patch)
tree05312de2fdf9015fff400a78d1b47f50b6fcf3a8 /drivers/hid
parentHID: do not inline some hid_hw_ functions (diff)
downloadlinux-dev-8aa45b544db9788b0fcc7a300eba8a3ade5d3d50.tar.xz
linux-dev-8aa45b544db9788b0fcc7a300eba8a3ade5d3d50.zip
HID: Add map_msc() to avoid boilerplate code
Since we are going to have more MSC events too, add map_msc() that can be used to fill in necessary fields and avoid boilerplate code. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Tero Kristo <tero.kristo@linux.intel.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Link: https://lore.kernel.org/r/20211210111138.1248187-2-tero.kristo@linux.intel.com
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-input.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 217f2d1b91c5..fbbb82f65842 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -52,6 +52,7 @@ static const struct {
#define map_rel(c) hid_map_usage(hidinput, usage, &bit, &max, EV_REL, (c))
#define map_key(c) hid_map_usage(hidinput, usage, &bit, &max, EV_KEY, (c))
#define map_led(c) hid_map_usage(hidinput, usage, &bit, &max, EV_LED, (c))
+#define map_msc(c) hid_map_usage(hidinput, usage, &bit, &max, EV_MSC, (c))
#define map_abs_clear(c) hid_map_usage_clear(hidinput, usage, &bit, \
&max, EV_ABS, (c))
@@ -874,10 +875,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
case 0x5b: /* TransducerSerialNumber */
case 0x6e: /* TransducerSerialNumber2 */
- usage->type = EV_MSC;
- usage->code = MSC_SERIAL;
- bit = input->mscbit;
- max = MSC_MAX;
+ map_msc(MSC_SERIAL);
break;
default: goto unknown;