Drop acpi-button-call-device_init_wakeup-earlier-during-p.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/acpi-button-call-device_init_wakeup-earlier-during-p.patch b/queue-6.12/acpi-button-call-device_init_wakeup-earlier-during-p.patch
deleted file mode 100644 (file)
index 2cfd41c..0000000
--- a/queue-6.12/acpi-button-call-device_init_wakeup-earlier-during-p.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 9064761fe082ebf68c6b4f05799c6c7a80afa943 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 8 Feb 2026 15:13:26 +0100
-Subject: ACPI: button: Call device_init_wakeup() earlier during probe
-
-From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-
-[ Upstream commit e91f8c5305b92b63c8bac315f95c535d5c1e8fec ]
-
-Calling device_init_wakeup() after installing a notify handler in which
-wakeup events are signaled may cause a wakeup event to be missed if the
-device is probed right before a system suspend.
-
-To avoid this, move the device_init_wakeup() call in acpi_button_probe()
-before the notify handler installation and add a corresponding cleanup
-to the error path.
-
-Also carry out wakeup cleanup for the button in acpi_button_remove()
-because after that point the notify handler will not run for it and
-wakeup events coming from it will not be signaled.
-
-Fixes: 0d51157dfaac ("ACPI: button: Eliminate the driver notify callback")
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Link: https://patch.msgid.link/12854922.O9o76ZdvQC@rafael.j.wysocki
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/acpi/button.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index b899b8745fedd..38bc64d6bdaf3 100644
---- a/drivers/acpi/button.c
-+++ b/drivers/acpi/button.c
-@@ -625,6 +625,8 @@ static int acpi_button_probe(struct platform_device *pdev)
-               goto err_remove_fs;
-       }
- 
-+      device_init_wakeup(&pdev->dev, true);
-+
-       switch (device->device_type) {
-       case ACPI_BUS_TYPE_POWER_BUTTON:
-               status = acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-@@ -655,11 +657,11 @@ static int acpi_button_probe(struct platform_device *pdev)
-               lid_device = device;
-       }
- 
--      device_init_wakeup(&pdev->dev, true);
-       pr_info("%s [%s]\n", name, acpi_device_bid(device));
-       return 0;
- 
- err_input_unregister:
-+      device_init_wakeup(&pdev->dev, false);
-       input_unregister_device(input);
- err_remove_fs:
-       acpi_button_remove_fs(button);
-@@ -691,6 +693,8 @@ static void acpi_button_remove(struct platform_device *pdev)
-       }
-       acpi_os_wait_events_complete();
- 
-+      device_init_wakeup(&pdev->dev, false);
-+
-       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 735ef63cd5cd2c32de3940a81d903459bef8eb6f..8d514b1c783182b048e556bdb7b9dcf17ff679d5 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -361,7 +361,6 @@ 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-button-convert-the-driver-to-a-platform-one.patch
-acpi-button-call-device_init_wakeup-earlier-during-p.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-call-device_init_wakeup-earlier-during-p.patch b/queue-6.18/acpi-button-call-device_init_wakeup-earlier-during-p.patch
deleted file mode 100644 (file)
index 0623a88..0000000
--- a/queue-6.18/acpi-button-call-device_init_wakeup-earlier-during-p.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0cbd41fee306283a48dcba36cc7ac48a508c060e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 8 Feb 2026 15:13:26 +0100
-Subject: ACPI: button: Call device_init_wakeup() earlier during probe
-
-From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-
-[ Upstream commit e91f8c5305b92b63c8bac315f95c535d5c1e8fec ]
-
-Calling device_init_wakeup() after installing a notify handler in which
-wakeup events are signaled may cause a wakeup event to be missed if the
-device is probed right before a system suspend.
-
-To avoid this, move the device_init_wakeup() call in acpi_button_probe()
-before the notify handler installation and add a corresponding cleanup
-to the error path.
-
-Also carry out wakeup cleanup for the button in acpi_button_remove()
-because after that point the notify handler will not run for it and
-wakeup events coming from it will not be signaled.
-
-Fixes: 0d51157dfaac ("ACPI: button: Eliminate the driver notify callback")
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Link: https://patch.msgid.link/12854922.O9o76ZdvQC@rafael.j.wysocki
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/acpi/button.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index b899b8745fedd..38bc64d6bdaf3 100644
---- a/drivers/acpi/button.c
-+++ b/drivers/acpi/button.c
-@@ -625,6 +625,8 @@ static int acpi_button_probe(struct platform_device *pdev)
-               goto err_remove_fs;
-       }
- 
-+      device_init_wakeup(&pdev->dev, true);
-+
-       switch (device->device_type) {
-       case ACPI_BUS_TYPE_POWER_BUTTON:
-               status = acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-@@ -655,11 +657,11 @@ static int acpi_button_probe(struct platform_device *pdev)
-               lid_device = device;
-       }
- 
--      device_init_wakeup(&pdev->dev, true);
-       pr_info("%s [%s]\n", name, acpi_device_bid(device));
-       return 0;
- 
- err_input_unregister:
-+      device_init_wakeup(&pdev->dev, false);
-       input_unregister_device(input);
- err_remove_fs:
-       acpi_button_remove_fs(button);
-@@ -691,6 +693,8 @@ static void acpi_button_remove(struct platform_device *pdev)
-       }
-       acpi_os_wait_events_complete();
- 
-+      device_init_wakeup(&pdev->dev, false);
-+
-       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 b086dff653d39ce34bcd26e6225a7c47851114ad..734d362eb814ad123aa63487f431f9a3224679d7 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -503,7 +503,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-adjust-event-notification-routines.patch
 acpi-button-convert-the-driver-to-a-platform-one.patch
-acpi-button-call-device_init_wakeup-earlier-during-p.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-call-device_init_wakeup-earlier-during-p.patch b/queue-6.19/acpi-button-call-device_init_wakeup-earlier-during-p.patch
deleted file mode 100644 (file)
index 107729a..0000000
--- a/queue-6.19/acpi-button-call-device_init_wakeup-earlier-during-p.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 83d9fbf06e5510e15fe000aceb8a2e52dbf4a1ef Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 8 Feb 2026 15:13:26 +0100
-Subject: ACPI: button: Call device_init_wakeup() earlier during probe
-
-From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-
-[ Upstream commit e91f8c5305b92b63c8bac315f95c535d5c1e8fec ]
-
-Calling device_init_wakeup() after installing a notify handler in which
-wakeup events are signaled may cause a wakeup event to be missed if the
-device is probed right before a system suspend.
-
-To avoid this, move the device_init_wakeup() call in acpi_button_probe()
-before the notify handler installation and add a corresponding cleanup
-to the error path.
-
-Also carry out wakeup cleanup for the button in acpi_button_remove()
-because after that point the notify handler will not run for it and
-wakeup events coming from it will not be signaled.
-
-Fixes: 0d51157dfaac ("ACPI: button: Eliminate the driver notify callback")
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Link: https://patch.msgid.link/12854922.O9o76ZdvQC@rafael.j.wysocki
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/acpi/button.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index b899b8745fedd..38bc64d6bdaf3 100644
---- a/drivers/acpi/button.c
-+++ b/drivers/acpi/button.c
-@@ -625,6 +625,8 @@ static int acpi_button_probe(struct platform_device *pdev)
-               goto err_remove_fs;
-       }
- 
-+      device_init_wakeup(&pdev->dev, true);
-+
-       switch (device->device_type) {
-       case ACPI_BUS_TYPE_POWER_BUTTON:
-               status = acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
-@@ -655,11 +657,11 @@ static int acpi_button_probe(struct platform_device *pdev)
-               lid_device = device;
-       }
- 
--      device_init_wakeup(&pdev->dev, true);
-       pr_info("%s [%s]\n", name, acpi_device_bid(device));
-       return 0;
- 
- err_input_unregister:
-+      device_init_wakeup(&pdev->dev, false);
-       input_unregister_device(input);
- err_remove_fs:
-       acpi_button_remove_fs(button);
-@@ -691,6 +693,8 @@ static void acpi_button_remove(struct platform_device *pdev)
-       }
-       acpi_os_wait_events_complete();
- 
-+      device_init_wakeup(&pdev->dev, false);
-+
-       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 ade48569858bcad60d9a250cebf4660eb37b9282..84e98df3a89e80269df3ee1fc096785c15c2056c 100644 (file)
--- a/queue-6.19/series
+++ b/queue-6.19/series
@@ -625,7 +625,6 @@ 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-button-convert-the-driver-to-a-platform-one.patch
-acpi-button-call-device_init_wakeup-earlier-during-p.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