From 096ff6ecb4c67c8d9ae30aacdc9304e671d6889d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 11 Dec 2023 08:45:07 +0000 Subject: [PATCH] Revert "HID: core: store the unique system identifier in hid_device" This reverts commit 2c8f796104310d0ba8feccf8504da69d73b252de which is commit 1e839143d674603b0bbbc4c513bca35404967dbc upstream. It breaks the current Android ABI, and if needed, can be brought back in an abi-safe way in the future. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: Idfcb1fccdf3e86ebd34acc41041fe0893ddb0855 --- drivers/hid/hid-core.c | 4 +--- include/linux/hid.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index f8746aebf1b6..917b61931d07 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2441,12 +2441,10 @@ int hid_add_device(struct hid_device *hdev) hid_warn(hdev, "bad device descriptor (%d)\n", ret); } - hdev->id = atomic_inc_return(&id); - /* XXX hack, any other cleaner solution after the driver core * is converted to allow more than 20 bytes as the device name? */ dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, - hdev->vendor, hdev->product, hdev->id); + hdev->vendor, hdev->product, atomic_inc_return(&id)); hid_debug_register(hdev, dev_name(&hdev->dev)); ret = device_add(&hdev->dev); diff --git a/include/linux/hid.h b/include/linux/hid.h index 445de82282d6..115224aefa94 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -624,8 +624,6 @@ struct hid_device { /* device report descriptor */ spinlock_t debug_list_lock; wait_queue_head_t debug_wait; - unsigned int id; /* system unique id */ - ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(2); };