]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Drop acpi-button-convert-the-driver-to-a-platform-one.patch
authorSasha Levin <sashal@kernel.org>
Mon, 23 Feb 2026 19:20:18 +0000 (14:20 -0500)
committerSasha Levin <sashal@kernel.org>
Mon, 23 Feb 2026 19:20:18 +0000 (14:20 -0500)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-6.12/acpi-button-convert-the-driver-to-a-platform-one.patch [deleted file]
queue-6.12/series
queue-6.18/acpi-button-convert-the-driver-to-a-platform-one.patch [deleted file]
queue-6.18/series
queue-6.19/acpi-button-convert-the-driver-to-a-platform-one.patch [deleted file]
queue-6.19/series

diff --git a/queue-6.12/acpi-button-convert-the-driver-to-a-platform-one.patch b/queue-6.12/acpi-button-convert-the-driver-to-a-platform-one.patch
deleted file mode 100644 (file)
index d9a0587..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-From 6ce5fd8429d01ae657c5536d6605406e1cdc3036 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 15 Dec 2025 14:57:57 +0100
-Subject: ACPI: button: Convert the driver to a platform one
-
-From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-
-[ Upstream commit 52d86401963666423cb9a56d117136c846093db0 ]
-
-While binding drivers directly to struct acpi_device objects allows
-basic functionality to be provided, at least in the majority of cases,
-there are some problems with it, related to general consistency, sysfs
-layout, power management operation ordering, and code cleanliness.
-
-Overall, it is better to bind drivers to platform devices than to their
-ACPI companions, so convert the ACPI button driver to a platform one.
-
-While this is not expected to alter functionality, it changes sysfs
-layout and so it will be visible to user space.
-
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Link: https://patch.msgid.link/2461734.NG923GbCHz@rafael.j.wysocki
-Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/acpi/button.c | 61 +++++++++++++++++++++++--------------------
- 1 file changed, 32 insertions(+), 29 deletions(-)
-
-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index 09a6e4ffe9f20..b899b8745fedd 100644
---- a/drivers/acpi/button.c
-+++ b/drivers/acpi/button.c
-@@ -19,6 +19,7 @@
- #include <linux/slab.h>
- #include <linux/acpi.h>
- #include <linux/dmi.h>
-+#include <linux/platform_device.h>
- #include <acpi/button.h>
- #define ACPI_BUTTON_CLASS             "button"
-@@ -145,8 +146,8 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
-       {}
- };
--static int acpi_button_add(struct acpi_device *device);
--static void acpi_button_remove(struct acpi_device *device);
-+static int acpi_button_probe(struct platform_device *pdev);
-+static void acpi_button_remove(struct platform_device *pdev);
- #ifdef CONFIG_PM_SLEEP
- static int acpi_button_suspend(struct device *dev);
-@@ -157,19 +158,19 @@ static int acpi_button_resume(struct device *dev);
- #endif
- static SIMPLE_DEV_PM_OPS(acpi_button_pm, acpi_button_suspend, acpi_button_resume);
--static struct acpi_driver acpi_button_driver = {
--      .name = "button",
--      .class = ACPI_BUTTON_CLASS,
--      .ids = button_device_ids,
--      .ops = {
--              .add = acpi_button_add,
--              .remove = acpi_button_remove,
-+static struct platform_driver acpi_button_driver = {
-+      .probe = acpi_button_probe,
-+      .remove = acpi_button_remove,
-+      .driver = {
-+              .name = "acpi-button",
-+              .acpi_match_table = button_device_ids,
-+              .pm = &acpi_button_pm,
-       },
--      .drv.pm = &acpi_button_pm,
- };
- struct acpi_button {
-       struct acpi_device *adev;
-+      struct platform_device *pdev;
-       unsigned int type;
-       struct input_dev *input;
-       char phys[32];                  /* for input device */
-@@ -397,7 +398,7 @@ static int acpi_lid_update_state(struct acpi_button *button,
-               return state;
-       if (state && signal_wakeup)
--              acpi_pm_wakeup_event(&device->dev);
-+              acpi_pm_wakeup_event(&button->pdev->dev);
-       return acpi_lid_notify_state(button, state);
- }
-@@ -454,7 +455,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
-               return;
-       }
--      acpi_pm_wakeup_event(&device->dev);
-+      acpi_pm_wakeup_event(&button->pdev->dev);
-       if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE)
-               return;
-@@ -486,8 +487,7 @@ static u32 acpi_button_event(void *data)
- #ifdef CONFIG_PM_SLEEP
- static int acpi_button_suspend(struct device *dev)
- {
--      struct acpi_device *device = to_acpi_device(dev);
--      struct acpi_button *button = acpi_driver_data(device);
-+      struct acpi_button *button = dev_get_drvdata(dev);
-       button->suspended = true;
-       return 0;
-@@ -495,9 +495,9 @@ static int acpi_button_suspend(struct device *dev)
- static int acpi_button_resume(struct device *dev)
- {
-+      struct acpi_button *button = dev_get_drvdata(dev);
-+      struct acpi_device *device = ACPI_COMPANION(dev);
-       struct input_dev *input;
--      struct acpi_device *device = to_acpi_device(dev);
--      struct acpi_button *button = acpi_driver_data(device);
-       button->suspended = false;
-       if (button->type == ACPI_BUTTON_TYPE_LID) {
-@@ -529,8 +529,9 @@ static int acpi_lid_input_open(struct input_dev *input)
-       return 0;
- }
--static int acpi_button_add(struct acpi_device *device)
-+static int acpi_button_probe(struct platform_device *pdev)
- {
-+      struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
-       acpi_notify_handler handler;
-       struct acpi_button *button;
-       struct input_dev *input;
-@@ -547,8 +548,9 @@ static int acpi_button_add(struct acpi_device *device)
-       if (!button)
-               return -ENOMEM;
--      device->driver_data = button;
-+      platform_set_drvdata(pdev, button);
-+      button->pdev = pdev;
-       button->adev = device;
-       button->input = input = input_allocate_device();
-       if (!input) {
-@@ -599,7 +601,7 @@ static int acpi_button_add(struct acpi_device *device)
-       input->phys = button->phys;
-       input->id.bustype = BUS_HOST;
-       input->id.product = button->type;
--      input->dev.parent = &device->dev;
-+      input->dev.parent = &pdev->dev;
-       switch (button->type) {
-       case ACPI_BUTTON_TYPE_POWER:
-@@ -653,7 +655,7 @@ static int acpi_button_add(struct acpi_device *device)
-               lid_device = device;
-       }
--      device_init_wakeup(&device->dev, true);
-+      device_init_wakeup(&pdev->dev, true);
-       pr_info("%s [%s]\n", name, acpi_device_bid(device));
-       return 0;
-@@ -666,9 +668,10 @@ static int acpi_button_add(struct acpi_device *device)
-       return error;
- }
--static void acpi_button_remove(struct acpi_device *device)
-+static void acpi_button_remove(struct platform_device *pdev)
- {
--      struct acpi_button *button = acpi_driver_data(device);
-+      struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
-+      struct acpi_button *button = platform_get_drvdata(pdev);
-       switch (device->device_type) {
-       case ACPI_BUS_TYPE_POWER_BUTTON:
-@@ -727,7 +730,7 @@ module_param_call(lid_init_state,
-                 NULL, 0644);
- MODULE_PARM_DESC(lid_init_state, "Behavior for reporting LID initial state");
--static int acpi_button_register_driver(struct acpi_driver *driver)
-+static int __init acpi_button_init(void)
- {
-       const struct dmi_system_id *dmi_id;
-@@ -743,20 +746,20 @@ static int acpi_button_register_driver(struct acpi_driver *driver)
-        * Modules such as nouveau.ko and i915.ko have a link time dependency
-        * on acpi_lid_open(), and would therefore not be loadable on ACPI
-        * capable kernels booted in non-ACPI mode if the return value of
--       * acpi_bus_register_driver() is returned from here with ACPI disabled
-+       * platform_driver_register() is returned from here with ACPI disabled
-        * when this driver is built as a module.
-        */
-       if (acpi_disabled)
-               return 0;
--      return acpi_bus_register_driver(driver);
-+      return platform_driver_register(&acpi_button_driver);
- }
--static void acpi_button_unregister_driver(struct acpi_driver *driver)
-+static void __exit acpi_button_exit(void)
- {
-       if (!acpi_disabled)
--              acpi_bus_unregister_driver(driver);
-+              platform_driver_unregister(&acpi_button_driver);
- }
--module_driver(acpi_button_driver, acpi_button_register_driver,
--             acpi_button_unregister_driver);
-+module_init(acpi_button_init);
-+module_exit(acpi_button_exit);
--- 
-2.51.0
-
index 8d514b1c783182b048e556bdb7b9dcf17ff679d5..2ffec7b555a5fa1aedfec4cb9b9e763eea8c8b9b 100644 (file)
@@ -360,7 +360,6 @@ 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-button-convert-the-driver-to-a-platform-one.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-convert-the-driver-to-a-platform-one.patch b/queue-6.18/acpi-button-convert-the-driver-to-a-platform-one.patch
deleted file mode 100644 (file)
index 5b5bcfd..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-From 04681d258c4a7119c6f042f3e3ff1eb4ed356615 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 15 Dec 2025 14:57:57 +0100
-Subject: ACPI: button: Convert the driver to a platform one
-
-From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-
-[ Upstream commit 52d86401963666423cb9a56d117136c846093db0 ]
-
-While binding drivers directly to struct acpi_device objects allows
-basic functionality to be provided, at least in the majority of cases,
-there are some problems with it, related to general consistency, sysfs
-layout, power management operation ordering, and code cleanliness.
-
-Overall, it is better to bind drivers to platform devices than to their
-ACPI companions, so convert the ACPI button driver to a platform one.
-
-While this is not expected to alter functionality, it changes sysfs
-layout and so it will be visible to user space.
-
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Link: https://patch.msgid.link/2461734.NG923GbCHz@rafael.j.wysocki
-Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/acpi/button.c | 61 +++++++++++++++++++++++--------------------
- 1 file changed, 32 insertions(+), 29 deletions(-)
-
-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index 09a6e4ffe9f20..b899b8745fedd 100644
---- a/drivers/acpi/button.c
-+++ b/drivers/acpi/button.c
-@@ -19,6 +19,7 @@
- #include <linux/slab.h>
- #include <linux/acpi.h>
- #include <linux/dmi.h>
-+#include <linux/platform_device.h>
- #include <acpi/button.h>
- #define ACPI_BUTTON_CLASS             "button"
-@@ -145,8 +146,8 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
-       {}
- };
--static int acpi_button_add(struct acpi_device *device);
--static void acpi_button_remove(struct acpi_device *device);
-+static int acpi_button_probe(struct platform_device *pdev);
-+static void acpi_button_remove(struct platform_device *pdev);
- #ifdef CONFIG_PM_SLEEP
- static int acpi_button_suspend(struct device *dev);
-@@ -157,19 +158,19 @@ static int acpi_button_resume(struct device *dev);
- #endif
- static SIMPLE_DEV_PM_OPS(acpi_button_pm, acpi_button_suspend, acpi_button_resume);
--static struct acpi_driver acpi_button_driver = {
--      .name = "button",
--      .class = ACPI_BUTTON_CLASS,
--      .ids = button_device_ids,
--      .ops = {
--              .add = acpi_button_add,
--              .remove = acpi_button_remove,
-+static struct platform_driver acpi_button_driver = {
-+      .probe = acpi_button_probe,
-+      .remove = acpi_button_remove,
-+      .driver = {
-+              .name = "acpi-button",
-+              .acpi_match_table = button_device_ids,
-+              .pm = &acpi_button_pm,
-       },
--      .drv.pm = &acpi_button_pm,
- };
- struct acpi_button {
-       struct acpi_device *adev;
-+      struct platform_device *pdev;
-       unsigned int type;
-       struct input_dev *input;
-       char phys[32];                  /* for input device */
-@@ -397,7 +398,7 @@ static int acpi_lid_update_state(struct acpi_button *button,
-               return state;
-       if (state && signal_wakeup)
--              acpi_pm_wakeup_event(&device->dev);
-+              acpi_pm_wakeup_event(&button->pdev->dev);
-       return acpi_lid_notify_state(button, state);
- }
-@@ -454,7 +455,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
-               return;
-       }
--      acpi_pm_wakeup_event(&device->dev);
-+      acpi_pm_wakeup_event(&button->pdev->dev);
-       if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE)
-               return;
-@@ -486,8 +487,7 @@ static u32 acpi_button_event(void *data)
- #ifdef CONFIG_PM_SLEEP
- static int acpi_button_suspend(struct device *dev)
- {
--      struct acpi_device *device = to_acpi_device(dev);
--      struct acpi_button *button = acpi_driver_data(device);
-+      struct acpi_button *button = dev_get_drvdata(dev);
-       button->suspended = true;
-       return 0;
-@@ -495,9 +495,9 @@ static int acpi_button_suspend(struct device *dev)
- static int acpi_button_resume(struct device *dev)
- {
-+      struct acpi_button *button = dev_get_drvdata(dev);
-+      struct acpi_device *device = ACPI_COMPANION(dev);
-       struct input_dev *input;
--      struct acpi_device *device = to_acpi_device(dev);
--      struct acpi_button *button = acpi_driver_data(device);
-       button->suspended = false;
-       if (button->type == ACPI_BUTTON_TYPE_LID) {
-@@ -529,8 +529,9 @@ static int acpi_lid_input_open(struct input_dev *input)
-       return 0;
- }
--static int acpi_button_add(struct acpi_device *device)
-+static int acpi_button_probe(struct platform_device *pdev)
- {
-+      struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
-       acpi_notify_handler handler;
-       struct acpi_button *button;
-       struct input_dev *input;
-@@ -547,8 +548,9 @@ static int acpi_button_add(struct acpi_device *device)
-       if (!button)
-               return -ENOMEM;
--      device->driver_data = button;
-+      platform_set_drvdata(pdev, button);
-+      button->pdev = pdev;
-       button->adev = device;
-       button->input = input = input_allocate_device();
-       if (!input) {
-@@ -599,7 +601,7 @@ static int acpi_button_add(struct acpi_device *device)
-       input->phys = button->phys;
-       input->id.bustype = BUS_HOST;
-       input->id.product = button->type;
--      input->dev.parent = &device->dev;
-+      input->dev.parent = &pdev->dev;
-       switch (button->type) {
-       case ACPI_BUTTON_TYPE_POWER:
-@@ -653,7 +655,7 @@ static int acpi_button_add(struct acpi_device *device)
-               lid_device = device;
-       }
--      device_init_wakeup(&device->dev, true);
-+      device_init_wakeup(&pdev->dev, true);
-       pr_info("%s [%s]\n", name, acpi_device_bid(device));
-       return 0;
-@@ -666,9 +668,10 @@ static int acpi_button_add(struct acpi_device *device)
-       return error;
- }
--static void acpi_button_remove(struct acpi_device *device)
-+static void acpi_button_remove(struct platform_device *pdev)
- {
--      struct acpi_button *button = acpi_driver_data(device);
-+      struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
-+      struct acpi_button *button = platform_get_drvdata(pdev);
-       switch (device->device_type) {
-       case ACPI_BUS_TYPE_POWER_BUTTON:
-@@ -727,7 +730,7 @@ module_param_call(lid_init_state,
-                 NULL, 0644);
- MODULE_PARM_DESC(lid_init_state, "Behavior for reporting LID initial state");
--static int acpi_button_register_driver(struct acpi_driver *driver)
-+static int __init acpi_button_init(void)
- {
-       const struct dmi_system_id *dmi_id;
-@@ -743,20 +746,20 @@ static int acpi_button_register_driver(struct acpi_driver *driver)
-        * Modules such as nouveau.ko and i915.ko have a link time dependency
-        * on acpi_lid_open(), and would therefore not be loadable on ACPI
-        * capable kernels booted in non-ACPI mode if the return value of
--       * acpi_bus_register_driver() is returned from here with ACPI disabled
-+       * platform_driver_register() is returned from here with ACPI disabled
-        * when this driver is built as a module.
-        */
-       if (acpi_disabled)
-               return 0;
--      return acpi_bus_register_driver(driver);
-+      return platform_driver_register(&acpi_button_driver);
- }
--static void acpi_button_unregister_driver(struct acpi_driver *driver)
-+static void __exit acpi_button_exit(void)
- {
-       if (!acpi_disabled)
--              acpi_bus_unregister_driver(driver);
-+              platform_driver_unregister(&acpi_button_driver);
- }
--module_driver(acpi_button_driver, acpi_button_register_driver,
--             acpi_button_unregister_driver);
-+module_init(acpi_button_init);
-+module_exit(acpi_button_exit);
--- 
-2.51.0
-
index 734d362eb814ad123aa63487f431f9a3224679d7..5e3865aed760f2674eabd72ff8b454c5f54d600d 100644 (file)
@@ -502,7 +502,6 @@ 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-button-convert-the-driver-to-a-platform-one.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-convert-the-driver-to-a-platform-one.patch b/queue-6.19/acpi-button-convert-the-driver-to-a-platform-one.patch
deleted file mode 100644 (file)
index 2eaabe6..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-From dd0277042a50c38fee804c39f50c9200163693b3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 15 Dec 2025 14:57:57 +0100
-Subject: ACPI: button: Convert the driver to a platform one
-
-From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-
-[ Upstream commit 52d86401963666423cb9a56d117136c846093db0 ]
-
-While binding drivers directly to struct acpi_device objects allows
-basic functionality to be provided, at least in the majority of cases,
-there are some problems with it, related to general consistency, sysfs
-layout, power management operation ordering, and code cleanliness.
-
-Overall, it is better to bind drivers to platform devices than to their
-ACPI companions, so convert the ACPI button driver to a platform one.
-
-While this is not expected to alter functionality, it changes sysfs
-layout and so it will be visible to user space.
-
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-Link: https://patch.msgid.link/2461734.NG923GbCHz@rafael.j.wysocki
-Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/acpi/button.c | 61 +++++++++++++++++++++++--------------------
- 1 file changed, 32 insertions(+), 29 deletions(-)
-
-diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
-index 09a6e4ffe9f20..b899b8745fedd 100644
---- a/drivers/acpi/button.c
-+++ b/drivers/acpi/button.c
-@@ -19,6 +19,7 @@
- #include <linux/slab.h>
- #include <linux/acpi.h>
- #include <linux/dmi.h>
-+#include <linux/platform_device.h>
- #include <acpi/button.h>
- #define ACPI_BUTTON_CLASS             "button"
-@@ -145,8 +146,8 @@ static const struct dmi_system_id dmi_lid_quirks[] = {
-       {}
- };
--static int acpi_button_add(struct acpi_device *device);
--static void acpi_button_remove(struct acpi_device *device);
-+static int acpi_button_probe(struct platform_device *pdev);
-+static void acpi_button_remove(struct platform_device *pdev);
- #ifdef CONFIG_PM_SLEEP
- static int acpi_button_suspend(struct device *dev);
-@@ -157,19 +158,19 @@ static int acpi_button_resume(struct device *dev);
- #endif
- static SIMPLE_DEV_PM_OPS(acpi_button_pm, acpi_button_suspend, acpi_button_resume);
--static struct acpi_driver acpi_button_driver = {
--      .name = "button",
--      .class = ACPI_BUTTON_CLASS,
--      .ids = button_device_ids,
--      .ops = {
--              .add = acpi_button_add,
--              .remove = acpi_button_remove,
-+static struct platform_driver acpi_button_driver = {
-+      .probe = acpi_button_probe,
-+      .remove = acpi_button_remove,
-+      .driver = {
-+              .name = "acpi-button",
-+              .acpi_match_table = button_device_ids,
-+              .pm = &acpi_button_pm,
-       },
--      .drv.pm = &acpi_button_pm,
- };
- struct acpi_button {
-       struct acpi_device *adev;
-+      struct platform_device *pdev;
-       unsigned int type;
-       struct input_dev *input;
-       char phys[32];                  /* for input device */
-@@ -397,7 +398,7 @@ static int acpi_lid_update_state(struct acpi_button *button,
-               return state;
-       if (state && signal_wakeup)
--              acpi_pm_wakeup_event(&device->dev);
-+              acpi_pm_wakeup_event(&button->pdev->dev);
-       return acpi_lid_notify_state(button, state);
- }
-@@ -454,7 +455,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data)
-               return;
-       }
--      acpi_pm_wakeup_event(&device->dev);
-+      acpi_pm_wakeup_event(&button->pdev->dev);
-       if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE)
-               return;
-@@ -486,8 +487,7 @@ static u32 acpi_button_event(void *data)
- #ifdef CONFIG_PM_SLEEP
- static int acpi_button_suspend(struct device *dev)
- {
--      struct acpi_device *device = to_acpi_device(dev);
--      struct acpi_button *button = acpi_driver_data(device);
-+      struct acpi_button *button = dev_get_drvdata(dev);
-       button->suspended = true;
-       return 0;
-@@ -495,9 +495,9 @@ static int acpi_button_suspend(struct device *dev)
- static int acpi_button_resume(struct device *dev)
- {
-+      struct acpi_button *button = dev_get_drvdata(dev);
-+      struct acpi_device *device = ACPI_COMPANION(dev);
-       struct input_dev *input;
--      struct acpi_device *device = to_acpi_device(dev);
--      struct acpi_button *button = acpi_driver_data(device);
-       button->suspended = false;
-       if (button->type == ACPI_BUTTON_TYPE_LID) {
-@@ -529,8 +529,9 @@ static int acpi_lid_input_open(struct input_dev *input)
-       return 0;
- }
--static int acpi_button_add(struct acpi_device *device)
-+static int acpi_button_probe(struct platform_device *pdev)
- {
-+      struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
-       acpi_notify_handler handler;
-       struct acpi_button *button;
-       struct input_dev *input;
-@@ -547,8 +548,9 @@ static int acpi_button_add(struct acpi_device *device)
-       if (!button)
-               return -ENOMEM;
--      device->driver_data = button;
-+      platform_set_drvdata(pdev, button);
-+      button->pdev = pdev;
-       button->adev = device;
-       button->input = input = input_allocate_device();
-       if (!input) {
-@@ -599,7 +601,7 @@ static int acpi_button_add(struct acpi_device *device)
-       input->phys = button->phys;
-       input->id.bustype = BUS_HOST;
-       input->id.product = button->type;
--      input->dev.parent = &device->dev;
-+      input->dev.parent = &pdev->dev;
-       switch (button->type) {
-       case ACPI_BUTTON_TYPE_POWER:
-@@ -653,7 +655,7 @@ static int acpi_button_add(struct acpi_device *device)
-               lid_device = device;
-       }
--      device_init_wakeup(&device->dev, true);
-+      device_init_wakeup(&pdev->dev, true);
-       pr_info("%s [%s]\n", name, acpi_device_bid(device));
-       return 0;
-@@ -666,9 +668,10 @@ static int acpi_button_add(struct acpi_device *device)
-       return error;
- }
--static void acpi_button_remove(struct acpi_device *device)
-+static void acpi_button_remove(struct platform_device *pdev)
- {
--      struct acpi_button *button = acpi_driver_data(device);
-+      struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
-+      struct acpi_button *button = platform_get_drvdata(pdev);
-       switch (device->device_type) {
-       case ACPI_BUS_TYPE_POWER_BUTTON:
-@@ -727,7 +730,7 @@ module_param_call(lid_init_state,
-                 NULL, 0644);
- MODULE_PARM_DESC(lid_init_state, "Behavior for reporting LID initial state");
--static int acpi_button_register_driver(struct acpi_driver *driver)
-+static int __init acpi_button_init(void)
- {
-       const struct dmi_system_id *dmi_id;
-@@ -743,20 +746,20 @@ static int acpi_button_register_driver(struct acpi_driver *driver)
-        * Modules such as nouveau.ko and i915.ko have a link time dependency
-        * on acpi_lid_open(), and would therefore not be loadable on ACPI
-        * capable kernels booted in non-ACPI mode if the return value of
--       * acpi_bus_register_driver() is returned from here with ACPI disabled
-+       * platform_driver_register() is returned from here with ACPI disabled
-        * when this driver is built as a module.
-        */
-       if (acpi_disabled)
-               return 0;
--      return acpi_bus_register_driver(driver);
-+      return platform_driver_register(&acpi_button_driver);
- }
--static void acpi_button_unregister_driver(struct acpi_driver *driver)
-+static void __exit acpi_button_exit(void)
- {
-       if (!acpi_disabled)
--              acpi_bus_unregister_driver(driver);
-+              platform_driver_unregister(&acpi_button_driver);
- }
--module_driver(acpi_button_driver, acpi_button_register_driver,
--             acpi_button_unregister_driver);
-+module_init(acpi_button_init);
-+module_exit(acpi_button_exit);
--- 
-2.51.0
-
index 84e98df3a89e80269df3ee1fc096785c15c2056c..b5df335b7f3892904d0ec6980490e9ddc1fa1140 100644 (file)
@@ -624,7 +624,6 @@ 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-button-convert-the-driver-to-a-platform-one.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