github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

platform/x86: sony-laptop: Convert PIC driver to a platform one

Browse Source 
In all cases in which a struct acpi_driver is used for binding a driver
to an ACPI device object, a corresponding platform device is created by
the ACPI core and that device is regarded as a proper representation of
underlying hardware.  Accordingly, a struct platform_driver should be
used by driver code to bind to that device.  There are multiple reasons
why drivers should not bind directly to ACPI device objects [1].

Overall, it is better to bind drivers to platform devices than to their
ACPI companions, so convert the Programmable IO Control (pic) part of
the Sony laptop driver from an ACPI 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.

Link: https://lore.kernel.org/all/2396510.ElGaqSPkdT@rafael.j.wysocki/ [1]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2059875.yKVeVyVuyW@rafael.j.wysocki
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
Rafael J. Wysocki 2026-03-12 12:30:27 +01:00 committed by Ilpo Järvinen
parent 14004dd31c
commit 138db7ee58
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/platform/x86/sony-laptop.c
View File

@ -4279,9 +4279,9 @@ static int sony_pic_possible_resources(struct acpi_device *device)
/* /*
* Disable the spic device by calling its _DIS method * Disable the spic device by calling its _DIS method
*/ */
static int sony_pic_disable(struct acpi_device *device) static int sony_pic_disable(struct device *dev)
{ {
acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL, acpi_status ret = acpi_evaluate_object(ACPI_HANDLE(dev), "_DIS", NULL,
NULL); NULL);
if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND) if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
@ -4297,7 +4297,7 @@ static int sony_pic_disable(struct acpi_device *device)
* *
* Call _SRS to set current resources * Call _SRS to set current resources
*/ */
static int sony_pic_enable(struct acpi_device *device, static int sony_pic_enable(struct device *dev,
struct sony_pic_ioport *ioport, struct sony_pic_irq *irq) struct sony_pic_ioport *ioport, struct sony_pic_irq *irq)
{ {
acpi_status status; acpi_status status;
@ -4379,7 +4379,7 @@ static int sony_pic_enable(struct acpi_device *device,
/* Attempt to set the resource */ /* Attempt to set the resource */
dprintk("Evaluating _SRS\n"); dprintk("Evaluating _SRS\n");
status = acpi_set_current_resources(device->handle, &buffer); status = acpi_set_current_resources(ACPI_HANDLE(dev), &buffer);
/* check for total failure */ /* check for total failure */
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
@ -4468,12 +4468,12 @@ static irqreturn_t sony_pic_irq(int irq, void *dev_id)
* ACPI driver * ACPI driver
* *
*****************/ *****************/
static void sony_pic_remove(struct acpi_device *device) static void sony_pic_remove(struct platform_device *pdev)
{ {
struct sony_pic_ioport *io, *tmp_io; struct sony_pic_ioport *io, *tmp_io;
struct sony_pic_irq *irq, *tmp_irq; struct sony_pic_irq *irq, *tmp_irq;
if (sony_pic_disable(device)) { if (sony_pic_disable(&pdev->dev)) {
pr_err("Couldn't disable device\n"); pr_err("Couldn't disable device\n");
return; return;
} }
@ -4507,11 +4507,12 @@ static void sony_pic_remove(struct acpi_device *device)
dprintk(SONY_PIC_DRIVER_NAME " removed.\n"); dprintk(SONY_PIC_DRIVER_NAME " removed.\n");
} }
static int sony_pic_add(struct acpi_device *device) static int sony_pic_probe(struct platform_device *pdev)
{ {
int result; struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
struct sony_pic_ioport *io, *tmp_io; struct sony_pic_ioport *io, *tmp_io;
struct sony_pic_irq *irq, *tmp_irq; struct sony_pic_irq *irq, *tmp_irq;
int result;
spic_dev.acpi_dev = device; spic_dev.acpi_dev = device;
strscpy(acpi_device_class(device), "sony/hotkey"); strscpy(acpi_device_class(device), "sony/hotkey");
@ -4526,7 +4527,7 @@ static int sony_pic_add(struct acpi_device *device)
} }
/* setup input devices and helper fifo */ /* setup input devices and helper fifo */
result = sony_laptop_setup_input(&device->dev); result = sony_laptop_setup_input(&pdev->dev);
if (result) { if (result) {
pr_err("Unable to create input devices\n"); pr_err("Unable to create input devices\n");
goto err_free_resources; goto err_free_resources;
@ -4596,7 +4597,7 @@ static int sony_pic_add(struct acpi_device *device)
} }
/* set resource status _SRS */ /* set resource status _SRS */
result = sony_pic_enable(device, spic_dev.cur_ioport, spic_dev.cur_irq); result = sony_pic_enable(&pdev->dev, spic_dev.cur_ioport, spic_dev.cur_irq);
if (result) { if (result) {
pr_err("Couldn't enable device\n"); pr_err("Couldn't enable device\n");
goto err_free_irq; goto err_free_irq;
@ -4619,7 +4620,7 @@ static int sony_pic_add(struct acpi_device *device)
sony_pf_remove(); sony_pf_remove();
err_disable_device: err_disable_device:
sony_pic_disable(device); sony_pic_disable(&pdev->dev);
err_free_irq: err_free_irq:
free_irq(spic_dev.cur_irq->irq.interrupts[0], &spic_dev); free_irq(spic_dev.cur_irq->irq.interrupts[0], &spic_dev);
@ -4655,15 +4656,14 @@ static int sony_pic_add(struct acpi_device *device)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int sony_pic_suspend(struct device *dev) static int sony_pic_suspend(struct device *dev)
{ {
if (sony_pic_disable(to_acpi_device(dev))) if (sony_pic_disable(dev))
return -ENXIO; return -ENXIO;
return 0; return 0;
} }
static int sony_pic_resume(struct device *dev) static int sony_pic_resume(struct device *dev)
{ {
sony_pic_enable(to_acpi_device(dev), sony_pic_enable(dev, spic_dev.cur_ioport, spic_dev.cur_irq);
spic_dev.cur_ioport, spic_dev.cur_irq);
return 0; return 0;
} }
#endif #endif
@ -4675,15 +4675,14 @@ static const struct acpi_device_id sony_pic_device_ids[] = {
{"", 0}, {"", 0},
}; };
static struct acpi_driver sony_pic_driver = { static struct platform_driver sony_pic_driver = {
.name = SONY_PIC_DRIVER_NAME, .probe = sony_pic_probe,
.class = SONY_PIC_CLASS,
.ids = sony_pic_device_ids,
.ops = {
.add = sony_pic_add,
.remove = sony_pic_remove, .remove = sony_pic_remove,
.driver = {
.name = SONY_PIC_DRIVER_NAME,
.acpi_match_table = sony_pic_device_ids,
.pm = &sony_pic_pm,
}, },
.drv.pm = &sony_pic_pm,
}; };
static const struct dmi_system_id sonypi_dmi_table[] __initconst = { static const struct dmi_system_id sonypi_dmi_table[] __initconst = {
@ -4709,7 +4708,7 @@ static int __init sony_laptop_init(void)
int result; int result;
if (!no_spic && dmi_check_system(sonypi_dmi_table)) { if (!no_spic && dmi_check_system(sonypi_dmi_table)) {
result = acpi_bus_register_driver(&sony_pic_driver); result = platform_driver_register(&sony_pic_driver);
if (result) { if (result) {
pr_err("Unable to register SPIC driver\n"); pr_err("Unable to register SPIC driver\n");
goto out; goto out;
@ -4727,7 +4726,7 @@ static int __init sony_laptop_init(void)
out_unregister_pic: out_unregister_pic:
if (spic_drv_registered) if (spic_drv_registered)
acpi_bus_unregister_driver(&sony_pic_driver); platform_driver_unregister(&sony_pic_driver);
out: out:
return result; return result;
} }
@ -4736,7 +4735,7 @@ static void __exit sony_laptop_exit(void)
{ {
platform_driver_unregister(&sony_nc_driver); platform_driver_unregister(&sony_nc_driver);
if (spic_drv_registered) if (spic_drv_registered)
acpi_bus_unregister_driver(&sony_pic_driver); platform_driver_unregister(&sony_pic_driver);
} }
module_init(sony_laptop_init); module_init(sony_laptop_init);