Because the name of the BTN_EXTRA and BTN_SIDE defines was a mismatch with
how their values were actually being used, they have been deprecated.
This commit moves the ati_remote code over to the new defines with the
_same_ value.
This commit does not cause any functional changes, after this userspace
will see the exact same input_event codes as before.
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
---
drivers/media/rc/ati_remote.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c
index 265e91a2a70d..451efa9d7d49 100644
--- a/drivers/media/rc/ati_remote.c
+++ b/drivers/media/rc/ati_remote.c
@@ -306,8 +306,8 @@ static const struct {
/* Artificial "doubleclick" events are generated by the hardware.
* They are mapped to the "side" and "extra" mouse buttons here. */
- {KIND_FILTERED, 0x7a, BTN_SIDE}, /* left dblclick */
- {KIND_FILTERED, 0x7e, BTN_EXTRA},/* right dblclick */
+ {KIND_FILTERED, 0x7a, BTN_BACKWRD}, /* left dblclick */
+ {KIND_FILTERED, 0x7e, BTN_FORWRD},/* right dblclick */
/* Non-mouse events are handled by rc-core */
{KIND_END, 0x00, 0}
@@ -737,7 +737,7 @@ static void ati_remote_input_init(struct ati_remote *ati_remote)
idev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
idev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_LEFT) |
- BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_SIDE) | BIT_MASK(BTN_EXTRA);
+ BIT_MASK(BTN_RIGHT) | BIT_MASK(BTN_BACKWRD) | BIT_MASK(BTN_FORWRD);
idev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
for (i = 0; ati_remote_tbl[i].kind != KIND_END; i++)
if (ati_remote_tbl[i].kind == KIND_LITERAL ||
--
2.21.0
