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

platform/x86: toshiba_bluetooth: Convert ACPI 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 Toshiba Bluetooth Enable 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/3420881.44csPzL39Z@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-24 21:01:28 +01:00 committed by Ilpo Järvinen
parent 4315abf338
commit 553b2ac59f
No known key found for this signature in database
GPG Key ID: 59AC4F6153E5CE31
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/platform/x86/toshiba_bluetooth.c
View File

@ -17,6 +17,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/rfkill.h> #include <linux/rfkill.h>
#include <linux/platform_device.h>
#define BT_KILLSWITCH_MASK 0x01 #define BT_KILLSWITCH_MASK 0x01
#define BT_PLUGGED_MASK 0x40 #define BT_PLUGGED_MASK 0x40
@ -35,8 +36,8 @@ struct toshiba_bluetooth_dev {
bool powered; bool powered;
}; };
static int toshiba_bt_rfkill_add(struct acpi_device *device); static int toshiba_bt_rfkill_probe(struct platform_device *pdev);
static void toshiba_bt_rfkill_remove(struct acpi_device *device); static void toshiba_bt_rfkill_remove(struct platform_device *pdev);
static void toshiba_bt_rfkill_notify(acpi_handle handle, u32 event, void *data); static void toshiba_bt_rfkill_notify(acpi_handle handle, u32 event, void *data);
static const struct acpi_device_id bt_device_ids[] = { static const struct acpi_device_id bt_device_ids[] = {
@ -50,15 +51,14 @@ static int toshiba_bt_resume(struct device *dev);
#endif #endif
static SIMPLE_DEV_PM_OPS(toshiba_bt_pm, NULL, toshiba_bt_resume); static SIMPLE_DEV_PM_OPS(toshiba_bt_pm, NULL, toshiba_bt_resume);
static struct acpi_driver toshiba_bt_rfkill_driver = { static struct platform_driver toshiba_bt_rfkill_driver = {
.name = "Toshiba BT", .probe = toshiba_bt_rfkill_probe,
.class = "Toshiba", .remove = toshiba_bt_rfkill_remove,
.ids = bt_device_ids, .driver = {
.ops = { .name = "Toshiba BT",
.add = toshiba_bt_rfkill_add, .acpi_match_table = bt_device_ids,
.remove = toshiba_bt_rfkill_remove, .pm = &toshiba_bt_pm,
}, },
.drv.pm = &toshiba_bt_pm,
}; };
static int toshiba_bluetooth_present(acpi_handle handle) static int toshiba_bluetooth_present(acpi_handle handle)
@ -215,11 +215,9 @@ static void toshiba_bt_rfkill_notify(acpi_handle handle, u32 event, void *data)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int toshiba_bt_resume(struct device *dev) static int toshiba_bt_resume(struct device *dev)
{ {
struct toshiba_bluetooth_dev *bt_dev; struct toshiba_bluetooth_dev *bt_dev = dev_get_drvdata(dev);
int ret; int ret;
bt_dev = acpi_driver_data(to_acpi_device(dev));
ret = toshiba_bluetooth_sync_status(bt_dev); ret = toshiba_bluetooth_sync_status(bt_dev);
if (ret) if (ret)
return ret; return ret;
@ -230,8 +228,9 @@ static int toshiba_bt_resume(struct device *dev)
} }
#endif #endif
static int toshiba_bt_rfkill_add(struct acpi_device *device) static int toshiba_bt_rfkill_probe(struct platform_device *pdev)
{ {
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
struct toshiba_bluetooth_dev *bt_dev; struct toshiba_bluetooth_dev *bt_dev;
int result; int result;
@ -245,8 +244,8 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device)
if (!bt_dev) if (!bt_dev)
return -ENOMEM; return -ENOMEM;
bt_dev->acpi_dev = device; bt_dev->acpi_dev = device;
device->driver_data = bt_dev;
dev_set_drvdata(&device->dev, bt_dev); platform_set_drvdata(pdev, bt_dev);
result = toshiba_bluetooth_sync_status(bt_dev); result = toshiba_bluetooth_sync_status(bt_dev);
if (result) { if (result) {
@ -255,7 +254,7 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device)
} }
bt_dev->rfk = rfkill_alloc("Toshiba Bluetooth", bt_dev->rfk = rfkill_alloc("Toshiba Bluetooth",
&device->dev, &pdev->dev,
RFKILL_TYPE_BLUETOOTH, RFKILL_TYPE_BLUETOOTH,
&rfk_ops, &rfk_ops,
bt_dev); bt_dev);
@ -291,9 +290,10 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device)
return result; return result;
} }
static void toshiba_bt_rfkill_remove(struct acpi_device *device) static void toshiba_bt_rfkill_remove(struct platform_device *pdev)
{ {
struct toshiba_bluetooth_dev *bt_dev = acpi_driver_data(device); struct toshiba_bluetooth_dev *bt_dev = platform_get_drvdata(pdev);
struct acpi_device *device = ACPI_COMPANION(&pdev->dev);
/* clean up */ /* clean up */
acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY, acpi_dev_remove_notify_handler(device, ACPI_DEVICE_NOTIFY,
@ -309,4 +309,4 @@ static void toshiba_bt_rfkill_remove(struct acpi_device *device)
toshiba_bluetooth_disable(device->handle); toshiba_bluetooth_disable(device->handle);
} }
module_acpi_driver(toshiba_bt_rfkill_driver); module_platform_driver(toshiba_bt_rfkill_driver);