From 94a8600a0d50aa9aeebbbdaf1e0f9bd5c9fa234f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 19 Dec 2023 12:45:36 +0000 Subject: [PATCH] Revert "HID: core: store the unique system identifier in hid_device" This reverts commit 52badc06b119da3c559a4b835334cc70d4561b4b which is commit 1e839143d674603b0bbbc4c513bca35404967dbc upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I1c9b7949853c19e46c3dc125d8e9d7ca15ada746 Signed-off-by: Greg Kroah-Hartman --- 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 35046adf1294..d941023c5628 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2442,12 +2442,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 9bbc3455d1c6..5ac7863d01aa 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -633,8 +633,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); };