From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC861336EDA; Mon, 15 Dec 2025 14:04:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765807464; cv=none; b=At044RdLXCHhqH5XFxCo0F4KsT2EOKsuuLeClbs74GRfGNVxfuir5RQAkaMOkHCgfBK7pgzJYMXiDCTbXMij7QLZ/1sdf3vzgWyjLXiMiLVdpTHfi1Ebo31d8Q2RQ0x6DmGfskw3ezytIAdoYPDa7O5z0wRTLczaIOendEreug8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765807464; c=relaxed/simple; bh=PL9BeK4giruERF248zjCSpak7uhfAahkOoRBL76iZ8Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WiFCdXZOF0S9IHhpCSrwLLA8VpjzAIUiE//GnKUYvgbqSewZ6SKzRkhRgB93r1WsVKWG1C2fp5r67EA6tQpJgE0EQ5NaS7WU8Q83X0dpHJXAwFNeJVcN9SlN5Y3W0bEdIiqt1whaasfNh/mjTR7+zmopDY8rQ8youdyMG+/ankw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mhDE/8WS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mhDE/8WS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68FD1C4AF0B; Mon, 15 Dec 2025 14:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765807463; bh=PL9BeK4giruERF248zjCSpak7uhfAahkOoRBL76iZ8Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mhDE/8WSwaMjMnksAbTGxtBIk0Dz3XLN1WsLpgtpmiNVQQCm4B8b+V9evW9ZPd+qo eJjnBHddts3ULZ1oy3uJ2hoVr0J0ll4LzmPLPSNIfJWVKCs+XwykPuTCLOLNKYthfm EJTSwQGW0DuWAaSHDXIJp2UwVIHwIfTU9orc5cNWEu8pAtplLCYlj2ZtbcZHosxa4Q YqWLa0wrzhN1gShxyRS9JGDSvd7VXqu1HhKi5i3o5xF2zwVk2//KqwHTEsYySDVPCQ qhMfaAf1SnRcHvC//K22G2+zOczd1oV47bR71dPeJDLV58KPvStcUhgI0GZoK9o84p 9p20Da/OtQuwQ== From: "Rafael J. Wysocki" To: Linux ACPI Cc: Hans de Goede , LKML , Linux PM , Thomas =?ISO-8859-1?Q?Wei=DFschuh?= , Armin Wolf Subject: [PATCH v2 04/10] ACPI: button: Convert the driver to a platform one Date: Mon, 15 Dec 2025 14:57:57 +0100 Message-ID: <2461734.NG923GbCHz@rafael.j.wysocki> Organization: Linux Kernel Development In-Reply-To: <2685338.Lt9SDvczpP@rafael.j.wysocki> References: <2685338.Lt9SDvczpP@rafael.j.wysocki> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" From: Rafael J. Wysocki 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 --- v1 -> v2: * Drop redundant driver_data removal operations. * Use dev_get_drvdata() where applicable to get the driver data pointer. --- drivers/acpi/button.c | 61 ++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 29 deletions(-) --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #define ACPI_BUTTON_CLASS "button" @@ -145,8 +146,8 @@ static const struct dmi_system_id dmi_li {} }; -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 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 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_hand 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 de 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 in 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_d 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_d 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_d 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 @@ err_free_button: 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(s * 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);