Unverified Commit 553b2ac5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Ilpo Järvinen
Browse files

platform/x86: toshiba_bluetooth: Convert ACPI driver to a platform one 

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3420881.44csPzL39Z@rafael.j.wysocki


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 4315abf3

drivers/platform/x86/toshiba_bluetooth.c

+21 −21
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/types.h>

#include <linux/acpi.h>

#include <linux/rfkill.h>

#include <linux/platform_device.h>



#define BT_KILLSWITCH_MASK	0x01

#define BT_PLUGGED_MASK		0x40
@@ -35,8 +36,8 @@ struct toshiba_bluetooth_dev { 
	bool powered;

};



static int toshiba_bt_rfkill_add(struct acpi_device *device);

static void toshiba_bt_rfkill_remove(struct acpi_device *device);

static int toshiba_bt_rfkill_probe(struct platform_device *pdev);

static void toshiba_bt_rfkill_remove(struct platform_device *pdev);

static void toshiba_bt_rfkill_notify(acpi_handle handle, u32 event, void *data);



static const struct acpi_device_id bt_device_ids[] = {
@@ -50,15 +51,14 @@ static int toshiba_bt_resume(struct device *dev); 
#endif

static SIMPLE_DEV_PM_OPS(toshiba_bt_pm, NULL, toshiba_bt_resume);



static struct acpi_driver toshiba_bt_rfkill_driver = {

	.name =		"Toshiba BT",

	.class =	"Toshiba",

	.ids =		bt_device_ids,

	.ops =		{

				.add =		toshiba_bt_rfkill_add,

static struct platform_driver toshiba_bt_rfkill_driver = {

	.probe = toshiba_bt_rfkill_probe,

	.remove = toshiba_bt_rfkill_remove,

	.driver = {

		.name = "Toshiba BT",

		.acpi_match_table = bt_device_ids,

		.pm = &toshiba_bt_pm,

	},

	.drv.pm =	&toshiba_bt_pm,

};



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

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;



	bt_dev = acpi_driver_data(to_acpi_device(dev));



	ret = toshiba_bluetooth_sync_status(bt_dev);

	if (ret)

		return ret;
@@ -230,8 +228,9 @@ static int toshiba_bt_resume(struct device *dev) 
}

#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;

	int result;
@@ -245,8 +244,8 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device) 
	if (!bt_dev)

		return -ENOMEM;

	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);

	if (result) {
@@ -255,7 +254,7 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device) 
	}



	bt_dev->rfk = rfkill_alloc("Toshiba Bluetooth",

				   &device->dev,

				   &pdev->dev,

				   RFKILL_TYPE_BLUETOOTH,

				   &rfk_ops,

				   bt_dev);
@@ -291,9 +290,10 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device) 
	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 */

	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);

}



module_acpi_driver(toshiba_bt_rfkill_driver);
 
module_platform_driver(toshiba_bt_rfkill_driver);