From: Sasha Levin Date: Mon, 23 Feb 2026 19:20:36 +0000 (-0500) Subject: Drop acpi-button-adjust-event-notification-routines.patch X-Git-Tag: v6.18.14~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ae77f8b6f402e59c225131910bae3887aec1ec8;p=thirdparty%2Fkernel%2Fstable-queue.git Drop acpi-button-adjust-event-notification-routines.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.12/acpi-button-adjust-event-notification-routines.patch b/queue-6.12/acpi-button-adjust-event-notification-routines.patch deleted file mode 100644 index 4403af9fad..0000000000 --- a/queue-6.12/acpi-button-adjust-event-notification-routines.patch +++ /dev/null @@ -1,262 +0,0 @@ -From 6a8ae58a1af4312d98a416626d5624a34584cab6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 15 Dec 2025 14:55:09 +0100 -Subject: ACPI: button: Adjust event notification routines - -From: Rafael J. Wysocki - -[ Upstream commit 93dc5db6d47aaa3b4b458ddfddfa3369c24e22f4 ] - -Adjust the event notification routines in the ACPI button driver to -take a struct acpi_button pointer as an argument istead of a struct -acpi_device one where applicable, which allows the use of -acpi_driver_data() to be limited and will facilitate subsequent -changes. - -No intentional functional impact. - -Signed-off-by: Rafael J. Wysocki -Link: https://patch.msgid.link/2260995.Icojqenx9y@rafael.j.wysocki -Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe") -Signed-off-by: Sasha Levin ---- - drivers/acpi/button.c | 67 +++++++++++++++++++++---------------------- - 1 file changed, 33 insertions(+), 34 deletions(-) - -diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c -index 3c6dd9b4ba0ad..09a6e4ffe9f20 100644 ---- a/drivers/acpi/button.c -+++ b/drivers/acpi/button.c -@@ -169,6 +169,7 @@ static struct acpi_driver acpi_button_driver = { - }; - - struct acpi_button { -+ struct acpi_device *adev; - unsigned int type; - struct input_dev *input; - char phys[32]; /* for input device */ -@@ -202,9 +203,9 @@ static int acpi_lid_evaluate_state(struct acpi_device *device) - return lid_state ? 1 : 0; - } - --static int acpi_lid_notify_state(struct acpi_device *device, int state) -+static int acpi_lid_notify_state(struct acpi_button *button, int state) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - ktime_t next_report; - bool do_update; - -@@ -287,18 +288,18 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state) - static int __maybe_unused acpi_button_state_seq_show(struct seq_file *seq, - void *offset) - { -- struct acpi_device *device = seq->private; -+ struct acpi_button *button = seq->private; - int state; - -- state = acpi_lid_evaluate_state(device); -+ state = acpi_lid_evaluate_state(button->adev); - seq_printf(seq, "state: %s\n", - state < 0 ? "unsupported" : (state ? "open" : "closed")); - return 0; - } - --static int acpi_button_add_fs(struct acpi_device *device) -+static int acpi_button_add_fs(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - struct proc_dir_entry *entry = NULL; - int ret = 0; - -@@ -333,7 +334,7 @@ static int acpi_button_add_fs(struct acpi_device *device) - /* create /proc/acpi/button/lid/LID/state */ - entry = proc_create_single_data(ACPI_BUTTON_FILE_STATE, S_IRUGO, - acpi_device_dir(device), acpi_button_state_seq_show, -- device); -+ button); - if (!entry) { - ret = -ENODEV; - goto remove_dev_dir; -@@ -355,9 +356,9 @@ static int acpi_button_add_fs(struct acpi_device *device) - goto done; - } - --static int acpi_button_remove_fs(struct acpi_device *device) -+static int acpi_button_remove_fs(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - - if (button->type != ACPI_BUTTON_TYPE_LID) - return 0; -@@ -385,9 +386,10 @@ int acpi_lid_open(void) - } - EXPORT_SYMBOL(acpi_lid_open); - --static int acpi_lid_update_state(struct acpi_device *device, -+static int acpi_lid_update_state(struct acpi_button *button, - bool signal_wakeup) - { -+ struct acpi_device *device = button->adev; - int state; - - state = acpi_lid_evaluate_state(device); -@@ -397,19 +399,17 @@ static int acpi_lid_update_state(struct acpi_device *device, - if (state && signal_wakeup) - acpi_pm_wakeup_event(&device->dev); - -- return acpi_lid_notify_state(device, state); -+ return acpi_lid_notify_state(button, state); - } - --static void acpi_lid_initialize_state(struct acpi_device *device) -+static void acpi_lid_initialize_state(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -- - switch (lid_init_state) { - case ACPI_BUTTON_LID_INIT_OPEN: -- (void)acpi_lid_notify_state(device, 1); -+ (void)acpi_lid_notify_state(button, 1); - break; - case ACPI_BUTTON_LID_INIT_METHOD: -- (void)acpi_lid_update_state(device, false); -+ (void)acpi_lid_update_state(button, false); - break; - case ACPI_BUTTON_LID_INIT_IGNORE: - default: -@@ -421,8 +421,8 @@ static void acpi_lid_initialize_state(struct acpi_device *device) - - static void acpi_lid_notify(acpi_handle handle, u32 event, void *data) - { -- struct acpi_device *device = data; -- struct acpi_button *button; -+ struct acpi_button *button = data; -+ struct acpi_device *device = button->adev; - - if (event != ACPI_BUTTON_NOTIFY_STATUS) { - acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n", -@@ -430,17 +430,16 @@ static void acpi_lid_notify(acpi_handle handle, u32 event, void *data) - return; - } - -- button = acpi_driver_data(device); - if (!button->lid_state_initialized) - return; - -- acpi_lid_update_state(device, true); -+ acpi_lid_update_state(button, true); - } - - static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - { -- struct acpi_device *device = data; -- struct acpi_button *button; -+ struct acpi_button *button = data; -+ struct acpi_device *device = button->adev; - struct input_dev *input; - int keycode; - -@@ -457,7 +456,6 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - - acpi_pm_wakeup_event(&device->dev); - -- button = acpi_driver_data(device); - if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE) - return; - -@@ -505,7 +503,7 @@ static int acpi_button_resume(struct device *dev) - if (button->type == ACPI_BUTTON_TYPE_LID) { - button->last_state = !!acpi_lid_evaluate_state(device); - button->last_time = ktime_get(); -- acpi_lid_initialize_state(device); -+ acpi_lid_initialize_state(button); - } - - if (button->type == ACPI_BUTTON_TYPE_POWER) { -@@ -521,12 +519,12 @@ static int acpi_button_resume(struct device *dev) - - static int acpi_lid_input_open(struct input_dev *input) - { -- struct acpi_device *device = input_get_drvdata(input); -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_button *button = input_get_drvdata(input); -+ struct acpi_device *device = button->adev; - - button->last_state = !!acpi_lid_evaluate_state(device); - button->last_time = ktime_get(); -- acpi_lid_initialize_state(device); -+ acpi_lid_initialize_state(button); - - return 0; - } -@@ -551,6 +549,7 @@ static int acpi_button_add(struct acpi_device *device) - - device->driver_data = button; - -+ button->adev = device; - button->input = input = input_allocate_device(); - if (!input) { - error = -ENOMEM; -@@ -587,7 +586,7 @@ static int acpi_button_add(struct acpi_device *device) - } - - if (!error) -- error = acpi_button_add_fs(device); -+ error = acpi_button_add_fs(button); - - if (error) { - input_free_device(input); -@@ -617,7 +616,7 @@ static int acpi_button_add(struct acpi_device *device) - break; - } - -- input_set_drvdata(input, device); -+ input_set_drvdata(input, button); - error = input_register_device(input); - if (error) { - input_free_device(input); -@@ -628,17 +627,17 @@ static int acpi_button_add(struct acpi_device *device) - case ACPI_BUS_TYPE_POWER_BUTTON: - status = acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON, - acpi_button_event, -- device); -+ button); - break; - case ACPI_BUS_TYPE_SLEEP_BUTTON: - status = acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON, - acpi_button_event, -- device); -+ button); - break; - default: - status = acpi_install_notify_handler(device->handle, - ACPI_ALL_NOTIFY, handler, -- device); -+ button); - break; - } - if (ACPI_FAILURE(status)) { -@@ -661,7 +660,7 @@ static int acpi_button_add(struct acpi_device *device) - err_input_unregister: - input_unregister_device(input); - err_remove_fs: -- acpi_button_remove_fs(device); -+ acpi_button_remove_fs(button); - err_free_button: - kfree(button); - return error; -@@ -689,7 +688,7 @@ static void acpi_button_remove(struct acpi_device *device) - } - acpi_os_wait_events_complete(); - -- acpi_button_remove_fs(device); -+ acpi_button_remove_fs(button); - input_unregister_device(button->input); - kfree(button); - } --- -2.51.0 - diff --git a/queue-6.12/series b/queue-6.12/series index 2ffec7b555..4331bfaccb 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -359,7 +359,6 @@ fs-ntfs3-prevent-infinite-loops-caused-by-the-next-v.patch fs-ntfs3-fix-slab-out-of-bounds-read-in-deleteindexe.patch acpi-button-install-notifier-for-system-events-as-we.patch acpi-button-only-send-key_power-for-acpi_button_noti.patch -acpi-button-adjust-event-notification-routines.patch acpi-cppc-fix-remaining-for_each_possible_cpu-to-use.patch powercap-intel_rapl_tpmi-remove-fw_bug-from-invalid-.patch kbuild-add-objtool-to-top-level-clean-target.patch diff --git a/queue-6.18/acpi-button-adjust-event-notification-routines.patch b/queue-6.18/acpi-button-adjust-event-notification-routines.patch deleted file mode 100644 index 9ac165e21b..0000000000 --- a/queue-6.18/acpi-button-adjust-event-notification-routines.patch +++ /dev/null @@ -1,262 +0,0 @@ -From 7ef894ebf106c74baec5924e515a2802ed21d287 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 15 Dec 2025 14:55:09 +0100 -Subject: ACPI: button: Adjust event notification routines - -From: Rafael J. Wysocki - -[ Upstream commit 93dc5db6d47aaa3b4b458ddfddfa3369c24e22f4 ] - -Adjust the event notification routines in the ACPI button driver to -take a struct acpi_button pointer as an argument istead of a struct -acpi_device one where applicable, which allows the use of -acpi_driver_data() to be limited and will facilitate subsequent -changes. - -No intentional functional impact. - -Signed-off-by: Rafael J. Wysocki -Link: https://patch.msgid.link/2260995.Icojqenx9y@rafael.j.wysocki -Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe") -Signed-off-by: Sasha Levin ---- - drivers/acpi/button.c | 67 +++++++++++++++++++++---------------------- - 1 file changed, 33 insertions(+), 34 deletions(-) - -diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c -index 3c6dd9b4ba0ad..09a6e4ffe9f20 100644 ---- a/drivers/acpi/button.c -+++ b/drivers/acpi/button.c -@@ -169,6 +169,7 @@ static struct acpi_driver acpi_button_driver = { - }; - - struct acpi_button { -+ struct acpi_device *adev; - unsigned int type; - struct input_dev *input; - char phys[32]; /* for input device */ -@@ -202,9 +203,9 @@ static int acpi_lid_evaluate_state(struct acpi_device *device) - return lid_state ? 1 : 0; - } - --static int acpi_lid_notify_state(struct acpi_device *device, int state) -+static int acpi_lid_notify_state(struct acpi_button *button, int state) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - ktime_t next_report; - bool do_update; - -@@ -287,18 +288,18 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state) - static int __maybe_unused acpi_button_state_seq_show(struct seq_file *seq, - void *offset) - { -- struct acpi_device *device = seq->private; -+ struct acpi_button *button = seq->private; - int state; - -- state = acpi_lid_evaluate_state(device); -+ state = acpi_lid_evaluate_state(button->adev); - seq_printf(seq, "state: %s\n", - state < 0 ? "unsupported" : (state ? "open" : "closed")); - return 0; - } - --static int acpi_button_add_fs(struct acpi_device *device) -+static int acpi_button_add_fs(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - struct proc_dir_entry *entry = NULL; - int ret = 0; - -@@ -333,7 +334,7 @@ static int acpi_button_add_fs(struct acpi_device *device) - /* create /proc/acpi/button/lid/LID/state */ - entry = proc_create_single_data(ACPI_BUTTON_FILE_STATE, S_IRUGO, - acpi_device_dir(device), acpi_button_state_seq_show, -- device); -+ button); - if (!entry) { - ret = -ENODEV; - goto remove_dev_dir; -@@ -355,9 +356,9 @@ static int acpi_button_add_fs(struct acpi_device *device) - goto done; - } - --static int acpi_button_remove_fs(struct acpi_device *device) -+static int acpi_button_remove_fs(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - - if (button->type != ACPI_BUTTON_TYPE_LID) - return 0; -@@ -385,9 +386,10 @@ int acpi_lid_open(void) - } - EXPORT_SYMBOL(acpi_lid_open); - --static int acpi_lid_update_state(struct acpi_device *device, -+static int acpi_lid_update_state(struct acpi_button *button, - bool signal_wakeup) - { -+ struct acpi_device *device = button->adev; - int state; - - state = acpi_lid_evaluate_state(device); -@@ -397,19 +399,17 @@ static int acpi_lid_update_state(struct acpi_device *device, - if (state && signal_wakeup) - acpi_pm_wakeup_event(&device->dev); - -- return acpi_lid_notify_state(device, state); -+ return acpi_lid_notify_state(button, state); - } - --static void acpi_lid_initialize_state(struct acpi_device *device) -+static void acpi_lid_initialize_state(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -- - switch (lid_init_state) { - case ACPI_BUTTON_LID_INIT_OPEN: -- (void)acpi_lid_notify_state(device, 1); -+ (void)acpi_lid_notify_state(button, 1); - break; - case ACPI_BUTTON_LID_INIT_METHOD: -- (void)acpi_lid_update_state(device, false); -+ (void)acpi_lid_update_state(button, false); - break; - case ACPI_BUTTON_LID_INIT_IGNORE: - default: -@@ -421,8 +421,8 @@ static void acpi_lid_initialize_state(struct acpi_device *device) - - static void acpi_lid_notify(acpi_handle handle, u32 event, void *data) - { -- struct acpi_device *device = data; -- struct acpi_button *button; -+ struct acpi_button *button = data; -+ struct acpi_device *device = button->adev; - - if (event != ACPI_BUTTON_NOTIFY_STATUS) { - acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n", -@@ -430,17 +430,16 @@ static void acpi_lid_notify(acpi_handle handle, u32 event, void *data) - return; - } - -- button = acpi_driver_data(device); - if (!button->lid_state_initialized) - return; - -- acpi_lid_update_state(device, true); -+ acpi_lid_update_state(button, true); - } - - static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - { -- struct acpi_device *device = data; -- struct acpi_button *button; -+ struct acpi_button *button = data; -+ struct acpi_device *device = button->adev; - struct input_dev *input; - int keycode; - -@@ -457,7 +456,6 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - - acpi_pm_wakeup_event(&device->dev); - -- button = acpi_driver_data(device); - if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE) - return; - -@@ -505,7 +503,7 @@ static int acpi_button_resume(struct device *dev) - if (button->type == ACPI_BUTTON_TYPE_LID) { - button->last_state = !!acpi_lid_evaluate_state(device); - button->last_time = ktime_get(); -- acpi_lid_initialize_state(device); -+ acpi_lid_initialize_state(button); - } - - if (button->type == ACPI_BUTTON_TYPE_POWER) { -@@ -521,12 +519,12 @@ static int acpi_button_resume(struct device *dev) - - static int acpi_lid_input_open(struct input_dev *input) - { -- struct acpi_device *device = input_get_drvdata(input); -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_button *button = input_get_drvdata(input); -+ struct acpi_device *device = button->adev; - - button->last_state = !!acpi_lid_evaluate_state(device); - button->last_time = ktime_get(); -- acpi_lid_initialize_state(device); -+ acpi_lid_initialize_state(button); - - return 0; - } -@@ -551,6 +549,7 @@ static int acpi_button_add(struct acpi_device *device) - - device->driver_data = button; - -+ button->adev = device; - button->input = input = input_allocate_device(); - if (!input) { - error = -ENOMEM; -@@ -587,7 +586,7 @@ static int acpi_button_add(struct acpi_device *device) - } - - if (!error) -- error = acpi_button_add_fs(device); -+ error = acpi_button_add_fs(button); - - if (error) { - input_free_device(input); -@@ -617,7 +616,7 @@ static int acpi_button_add(struct acpi_device *device) - break; - } - -- input_set_drvdata(input, device); -+ input_set_drvdata(input, button); - error = input_register_device(input); - if (error) { - input_free_device(input); -@@ -628,17 +627,17 @@ static int acpi_button_add(struct acpi_device *device) - case ACPI_BUS_TYPE_POWER_BUTTON: - status = acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON, - acpi_button_event, -- device); -+ button); - break; - case ACPI_BUS_TYPE_SLEEP_BUTTON: - status = acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON, - acpi_button_event, -- device); -+ button); - break; - default: - status = acpi_install_notify_handler(device->handle, - ACPI_ALL_NOTIFY, handler, -- device); -+ button); - break; - } - if (ACPI_FAILURE(status)) { -@@ -661,7 +660,7 @@ static int acpi_button_add(struct acpi_device *device) - err_input_unregister: - input_unregister_device(input); - err_remove_fs: -- acpi_button_remove_fs(device); -+ acpi_button_remove_fs(button); - err_free_button: - kfree(button); - return error; -@@ -689,7 +688,7 @@ static void acpi_button_remove(struct acpi_device *device) - } - acpi_os_wait_events_complete(); - -- acpi_button_remove_fs(device); -+ acpi_button_remove_fs(button); - input_unregister_device(button->input); - kfree(button); - } --- -2.51.0 - diff --git a/queue-6.18/series b/queue-6.18/series index 5e3865aed7..11ed72b20f 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -501,7 +501,6 @@ io_uring-cancel-de-unionize-file-and-user_data-in-st.patch fs-ntfs3-initialize-new-folios-before-use.patch fs-ntfs3-prevent-infinite-loops-caused-by-the-next-v.patch fs-ntfs3-fix-slab-out-of-bounds-read-in-deleteindexe.patch -acpi-button-adjust-event-notification-routines.patch acpi-cppc-fix-remaining-for_each_possible_cpu-to-use.patch powercap-intel_rapl_tpmi-remove-fw_bug-from-invalid-.patch kbuild-add-objtool-to-top-level-clean-target.patch diff --git a/queue-6.19/acpi-button-adjust-event-notification-routines.patch b/queue-6.19/acpi-button-adjust-event-notification-routines.patch deleted file mode 100644 index 83733f95a2..0000000000 --- a/queue-6.19/acpi-button-adjust-event-notification-routines.patch +++ /dev/null @@ -1,262 +0,0 @@ -From 3cf8856fd1a42acdd11e46712f0c261ba34d50ed Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 15 Dec 2025 14:55:09 +0100 -Subject: ACPI: button: Adjust event notification routines - -From: Rafael J. Wysocki - -[ Upstream commit 93dc5db6d47aaa3b4b458ddfddfa3369c24e22f4 ] - -Adjust the event notification routines in the ACPI button driver to -take a struct acpi_button pointer as an argument istead of a struct -acpi_device one where applicable, which allows the use of -acpi_driver_data() to be limited and will facilitate subsequent -changes. - -No intentional functional impact. - -Signed-off-by: Rafael J. Wysocki -Link: https://patch.msgid.link/2260995.Icojqenx9y@rafael.j.wysocki -Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe") -Signed-off-by: Sasha Levin ---- - drivers/acpi/button.c | 67 +++++++++++++++++++++---------------------- - 1 file changed, 33 insertions(+), 34 deletions(-) - -diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c -index 3c6dd9b4ba0ad..09a6e4ffe9f20 100644 ---- a/drivers/acpi/button.c -+++ b/drivers/acpi/button.c -@@ -169,6 +169,7 @@ static struct acpi_driver acpi_button_driver = { - }; - - struct acpi_button { -+ struct acpi_device *adev; - unsigned int type; - struct input_dev *input; - char phys[32]; /* for input device */ -@@ -202,9 +203,9 @@ static int acpi_lid_evaluate_state(struct acpi_device *device) - return lid_state ? 1 : 0; - } - --static int acpi_lid_notify_state(struct acpi_device *device, int state) -+static int acpi_lid_notify_state(struct acpi_button *button, int state) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - ktime_t next_report; - bool do_update; - -@@ -287,18 +288,18 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state) - static int __maybe_unused acpi_button_state_seq_show(struct seq_file *seq, - void *offset) - { -- struct acpi_device *device = seq->private; -+ struct acpi_button *button = seq->private; - int state; - -- state = acpi_lid_evaluate_state(device); -+ state = acpi_lid_evaluate_state(button->adev); - seq_printf(seq, "state: %s\n", - state < 0 ? "unsupported" : (state ? "open" : "closed")); - return 0; - } - --static int acpi_button_add_fs(struct acpi_device *device) -+static int acpi_button_add_fs(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - struct proc_dir_entry *entry = NULL; - int ret = 0; - -@@ -333,7 +334,7 @@ static int acpi_button_add_fs(struct acpi_device *device) - /* create /proc/acpi/button/lid/LID/state */ - entry = proc_create_single_data(ACPI_BUTTON_FILE_STATE, S_IRUGO, - acpi_device_dir(device), acpi_button_state_seq_show, -- device); -+ button); - if (!entry) { - ret = -ENODEV; - goto remove_dev_dir; -@@ -355,9 +356,9 @@ static int acpi_button_add_fs(struct acpi_device *device) - goto done; - } - --static int acpi_button_remove_fs(struct acpi_device *device) -+static int acpi_button_remove_fs(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_device *device = button->adev; - - if (button->type != ACPI_BUTTON_TYPE_LID) - return 0; -@@ -385,9 +386,10 @@ int acpi_lid_open(void) - } - EXPORT_SYMBOL(acpi_lid_open); - --static int acpi_lid_update_state(struct acpi_device *device, -+static int acpi_lid_update_state(struct acpi_button *button, - bool signal_wakeup) - { -+ struct acpi_device *device = button->adev; - int state; - - state = acpi_lid_evaluate_state(device); -@@ -397,19 +399,17 @@ static int acpi_lid_update_state(struct acpi_device *device, - if (state && signal_wakeup) - acpi_pm_wakeup_event(&device->dev); - -- return acpi_lid_notify_state(device, state); -+ return acpi_lid_notify_state(button, state); - } - --static void acpi_lid_initialize_state(struct acpi_device *device) -+static void acpi_lid_initialize_state(struct acpi_button *button) - { -- struct acpi_button *button = acpi_driver_data(device); -- - switch (lid_init_state) { - case ACPI_BUTTON_LID_INIT_OPEN: -- (void)acpi_lid_notify_state(device, 1); -+ (void)acpi_lid_notify_state(button, 1); - break; - case ACPI_BUTTON_LID_INIT_METHOD: -- (void)acpi_lid_update_state(device, false); -+ (void)acpi_lid_update_state(button, false); - break; - case ACPI_BUTTON_LID_INIT_IGNORE: - default: -@@ -421,8 +421,8 @@ static void acpi_lid_initialize_state(struct acpi_device *device) - - static void acpi_lid_notify(acpi_handle handle, u32 event, void *data) - { -- struct acpi_device *device = data; -- struct acpi_button *button; -+ struct acpi_button *button = data; -+ struct acpi_device *device = button->adev; - - if (event != ACPI_BUTTON_NOTIFY_STATUS) { - acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n", -@@ -430,17 +430,16 @@ static void acpi_lid_notify(acpi_handle handle, u32 event, void *data) - return; - } - -- button = acpi_driver_data(device); - if (!button->lid_state_initialized) - return; - -- acpi_lid_update_state(device, true); -+ acpi_lid_update_state(button, true); - } - - static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - { -- struct acpi_device *device = data; -- struct acpi_button *button; -+ struct acpi_button *button = data; -+ struct acpi_device *device = button->adev; - struct input_dev *input; - int keycode; - -@@ -457,7 +456,6 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - - acpi_pm_wakeup_event(&device->dev); - -- button = acpi_driver_data(device); - if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE) - return; - -@@ -505,7 +503,7 @@ static int acpi_button_resume(struct device *dev) - if (button->type == ACPI_BUTTON_TYPE_LID) { - button->last_state = !!acpi_lid_evaluate_state(device); - button->last_time = ktime_get(); -- acpi_lid_initialize_state(device); -+ acpi_lid_initialize_state(button); - } - - if (button->type == ACPI_BUTTON_TYPE_POWER) { -@@ -521,12 +519,12 @@ static int acpi_button_resume(struct device *dev) - - static int acpi_lid_input_open(struct input_dev *input) - { -- struct acpi_device *device = input_get_drvdata(input); -- struct acpi_button *button = acpi_driver_data(device); -+ struct acpi_button *button = input_get_drvdata(input); -+ struct acpi_device *device = button->adev; - - button->last_state = !!acpi_lid_evaluate_state(device); - button->last_time = ktime_get(); -- acpi_lid_initialize_state(device); -+ acpi_lid_initialize_state(button); - - return 0; - } -@@ -551,6 +549,7 @@ static int acpi_button_add(struct acpi_device *device) - - device->driver_data = button; - -+ button->adev = device; - button->input = input = input_allocate_device(); - if (!input) { - error = -ENOMEM; -@@ -587,7 +586,7 @@ static int acpi_button_add(struct acpi_device *device) - } - - if (!error) -- error = acpi_button_add_fs(device); -+ error = acpi_button_add_fs(button); - - if (error) { - input_free_device(input); -@@ -617,7 +616,7 @@ static int acpi_button_add(struct acpi_device *device) - break; - } - -- input_set_drvdata(input, device); -+ input_set_drvdata(input, button); - error = input_register_device(input); - if (error) { - input_free_device(input); -@@ -628,17 +627,17 @@ static int acpi_button_add(struct acpi_device *device) - case ACPI_BUS_TYPE_POWER_BUTTON: - status = acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON, - acpi_button_event, -- device); -+ button); - break; - case ACPI_BUS_TYPE_SLEEP_BUTTON: - status = acpi_install_fixed_event_handler(ACPI_EVENT_SLEEP_BUTTON, - acpi_button_event, -- device); -+ button); - break; - default: - status = acpi_install_notify_handler(device->handle, - ACPI_ALL_NOTIFY, handler, -- device); -+ button); - break; - } - if (ACPI_FAILURE(status)) { -@@ -661,7 +660,7 @@ static int acpi_button_add(struct acpi_device *device) - err_input_unregister: - input_unregister_device(input); - err_remove_fs: -- acpi_button_remove_fs(device); -+ acpi_button_remove_fs(button); - err_free_button: - kfree(button); - return error; -@@ -689,7 +688,7 @@ static void acpi_button_remove(struct acpi_device *device) - } - acpi_os_wait_events_complete(); - -- acpi_button_remove_fs(device); -+ acpi_button_remove_fs(button); - input_unregister_device(button->input); - kfree(button); - } --- -2.51.0 - diff --git a/queue-6.19/series b/queue-6.19/series index b5df335b7f..668618b03e 100644 --- a/queue-6.19/series +++ b/queue-6.19/series @@ -623,7 +623,6 @@ fs-ntfs3-fix-slab-out-of-bounds-read-in-deleteindexe.patch tools-power-turbostat-amd-msr-offset-0x611-read-fail.patch tools-power-turbostat-harden-against-unexpected-valu.patch powercap-intel_rapl-remove-incorrect-cpu-check-in-pm.patch -acpi-button-adjust-event-notification-routines.patch acpi-cppc-fix-remaining-for_each_possible_cpu-to-use.patch powercap-intel_rapl_tpmi-remove-fw_bug-from-invalid-.patch kbuild-add-objtool-to-top-level-clean-target.patch