Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2155719imu; Wed, 21 Nov 2018 07:28:48 -0800 (PST) X-Google-Smtp-Source: AFSGD/XdROuvj2BQlfkx5fjZZBUMaPyNN9I6LrvZLwUKoeWIw6zkNxAr2Qui4O3rEspCFDkU77KW X-Received: by 2002:a63:f811:: with SMTP id n17mr6547946pgh.23.1542814128774; Wed, 21 Nov 2018 07:28:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542814128; cv=none; d=google.com; s=arc-20160816; b=kqSMrRGsnhi+PGDjPUTYM3UNXSEyBYEvv3vt/SJTNB8Bh6A5nSP+sixQTEMay4FxJw EgLx/pNRBLfyesVC1yhs0TZ2y1J6L+yixY0ub0GiFgMwAVk3Hg5oUtdaX0xNPlnvgEqW ECPEKtkk1CxNQckNEuHpgTXTNkx0D2f1aWGMcaUKAWfWS8jSFRjgJzritdgN72rbq15W g5srqKnlS+3vl/NyhQ1KIasCYI2/7WGFVAmJuw4ofiBNkEfOLy0r+2pbiMUsH5bRwrLC 3oEbesriPtUxXZf4fx5iw+ND8Wd6YngOJiVMgHkL5ZH07CpWBdyOcDdo3jlP8zFd+Y2X 3omg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=rbPIm9q83LNeBT07SnEZQDgqeyJgb4p80v0Igx1Igm8=; b=EhzzCU3wGutTQKGlCVjyor9JL1HCe2UqubG0sd02GQjRBtLNPKAppd6QSQmuipIAqB YxwGagdq2cIH9q0f3eFNAD/xYtan6/GwlqgAXLrx7l49XqhF920h6FJjp0iBD5jBUDT4 haenO7uLCiRZpUXxXZmYiRkgyBEXuLloYgoWlDg1CsmI+AFfHdF2et7zFOcnFZ35fl8H gEeUgTuh3SB57RYmoVbEzlYe1b0OemFd9LE75+UVRIKyNgLXdpFs9drN5k2weSMBZZNP veQtl1eKPpiUwhZIUExPua6aoIkJBkg4lL8mz2RKQYyQSAEIDlhBt9FvaU+2uUhdg3FF 80Jg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a17si47568874pgv.456.2018.11.21.07.28.32; Wed, 21 Nov 2018 07:28:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731389AbeKVCC0 (ORCPT + 99 others); Wed, 21 Nov 2018 21:02:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38850 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731213AbeKVCCZ (ORCPT ); Wed, 21 Nov 2018 21:02:25 -0500 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 0329D308214B; Wed, 21 Nov 2018 15:27:32 +0000 (UTC) Received: from plouf.redhat.com (ovpn-204-124.brq.redhat.com [10.40.204.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 908581054FD6; Wed, 21 Nov 2018 15:27:29 +0000 (UTC) From: Benjamin Tissoires To: Dmitry Torokhov , Jiri Kosina , Harry Cutts , Peter Hutterer , torvalds@linux-foundation.org Cc: Nestor Lopez Casado , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Benjamin Tissoires Subject: [PATCH 3/7] Revert "HID: logitech: Use LDJ_DEVICE macro for existing Logitech mice" Date: Wed, 21 Nov 2018 16:27:08 +0100 Message-Id: <20181121152712.6770-4-benjamin.tissoires@redhat.com> In-Reply-To: <20181121152712.6770-1-benjamin.tissoires@redhat.com> References: <20181121152712.6770-1-benjamin.tissoires@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.42]); Wed, 21 Nov 2018 15:27:32 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 3fe1d6bbcd16f384d2c7dab2caf8e4b2df9ea7e6. It turns out the current API is not that compatible with some Microsoft mice, so better start again from scratch. Signed-off-by: Benjamin Tissoires --- drivers/hid/hid-logitech-hidpp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 5f0c080059c6..fd6a8c325fa0 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -3314,11 +3314,13 @@ static void hidpp_remove(struct hid_device *hdev) static const struct hid_device_id hidpp_devices[] = { { /* wireless touchpad */ - LDJ_DEVICE(0x4011), + HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, + USB_VENDOR_ID_LOGITECH, 0x4011), .driver_data = HIDPP_QUIRK_CLASS_WTP | HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS }, { /* wireless touchpad T650 */ - LDJ_DEVICE(0x4101), + HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, + USB_VENDOR_ID_LOGITECH, 0x4101), .driver_data = HIDPP_QUIRK_CLASS_WTP | HIDPP_QUIRK_DELAYED_INIT }, { /* wireless touchpad T651 */ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, @@ -3358,13 +3360,16 @@ static const struct hid_device_id hidpp_devices[] = { { /* Mouse Logitech Performance MX */ LDJ_DEVICE(0x101a), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 }, { /* Keyboard logitech K400 */ - LDJ_DEVICE(0x4024), + HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, + USB_VENDOR_ID_LOGITECH, 0x4024), .driver_data = HIDPP_QUIRK_CLASS_K400 }, { /* Solar Keyboard Logitech K750 */ - LDJ_DEVICE(0x4002), + HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, + USB_VENDOR_ID_LOGITECH, 0x4002), .driver_data = HIDPP_QUIRK_CLASS_K750 }, - { LDJ_DEVICE(HID_ANY_ID) }, + { HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, + USB_VENDOR_ID_LOGITECH, HID_ANY_ID)}, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G920_WHEEL), .driver_data = HIDPP_QUIRK_CLASS_G920 | HIDPP_QUIRK_FORCE_OUTPUT_REPORTS}, -- 2.19.1