From patchwork Sat Mar 30 13:37:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10878491 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 149EF1669 for ; Sat, 30 Mar 2019 13:37:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 003E528727 for ; Sat, 30 Mar 2019 13:37:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8ED228E44; Sat, 30 Mar 2019 13:37:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E5B428727 for ; Sat, 30 Mar 2019 13:37:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730844AbfC3Nhu (ORCPT ); Sat, 30 Mar 2019 09:37:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37184 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730784AbfC3Nhu (ORCPT ); Sat, 30 Mar 2019 09:37:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF234308339D; Sat, 30 Mar 2019 13:37:49 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-116-76.ams2.redhat.com [10.36.116.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CEEB1062229; Sat, 30 Mar 2019 13:37:48 +0000 (UTC) From: Hans de Goede To: Jiri Kosina , Benjamin Tissoires , Dmitry Torokhov Cc: Hans de Goede , Peter Hutterer , linux-input@vger.kernel.org Subject: [RFC 5/6] media: rc-core: ati_remote: Stop using deprecated BTN_EXTRA, _SIDE defines Date: Sat, 30 Mar 2019 14:37:34 +0100 Message-Id: <20190330133735.14681-6-hdegoede@redhat.com> In-Reply-To: <20190330133735.14681-1-hdegoede@redhat.com> References: <20190330133735.14681-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Sat, 30 Mar 2019 13:37:49 +0000 (UTC) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 ||