niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

i2c: scmi: Convert to be a platform driver

Browse source 
ACPI core in conjunction with platform driver core provides
an infrastructure to enumerate ACPI devices. Use it in order
to remove a lot of boilerplate code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Josef Johansson <josef@oderland.se>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Andy Shevchenko 2022-09-06 18:55:07 +03:00 • committed by Wolfram Sang
parent d819524d31
commit 03d4287add
1 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
drivers/i2c/busses/i2c-scmi.c
View file

@ -6,15 +6,13 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#define ACPI_SMBUS_HC_CLASS "smbus"
#define ACPI_SMBUS_HC_DEVICE_NAME "cmi"
/* SMBUS HID definition as supported by Microsoft Windows */ /* SMBUS HID definition as supported by Microsoft Windows */
#define ACPI_SMBUS_MS_HID "SMB0001" #define ACPI_SMBUS_MS_HID "SMB0001"
@ -30,7 +28,7 @@ struct acpi_smbus_cmi {
u8 cap_info:1; u8 cap_info:1;
u8 cap_read:1; u8 cap_read:1;
u8 cap_write:1; u8 cap_write:1;
struct smbus_methods_t *methods; const struct smbus_methods_t *methods;
}; };
static const struct smbus_methods_t smbus_methods = { static const struct smbus_methods_t smbus_methods = {
@ -358,29 +356,25 @@ static acpi_status acpi_smbus_cmi_query_methods(acpi_handle handle, u32 level,
return AE_OK; return AE_OK;
} }
static int acpi_smbus_cmi_add(struct acpi_device *device) static int smbus_cmi_probe(struct platform_device *device)
{ {
struct device *dev = &device->dev;
struct acpi_smbus_cmi *smbus_cmi; struct acpi_smbus_cmi *smbus_cmi;
const struct acpi_device_id *id;
int ret; int ret;
smbus_cmi = kzalloc(sizeof(struct acpi_smbus_cmi), GFP_KERNEL); smbus_cmi = kzalloc(sizeof(struct acpi_smbus_cmi), GFP_KERNEL);
if (!smbus_cmi) if (!smbus_cmi)
return -ENOMEM; return -ENOMEM;
smbus_cmi->handle = device->handle; smbus_cmi->handle = ACPI_HANDLE(dev);
strcpy(acpi_device_name(device), ACPI_SMBUS_HC_DEVICE_NAME); smbus_cmi->methods = device_get_match_data(dev);
strcpy(acpi_device_class(device), ACPI_SMBUS_HC_CLASS);
device->driver_data = smbus_cmi; platform_set_drvdata(device, smbus_cmi);
smbus_cmi->cap_info = 0; smbus_cmi->cap_info = 0;
smbus_cmi->cap_read = 0; smbus_cmi->cap_read = 0;
smbus_cmi->cap_write = 0; smbus_cmi->cap_write = 0;
for (id = acpi_smbus_cmi_ids; id->id[0]; id++)
if (!strcmp(id->id, acpi_device_hid(device)))
smbus_cmi->methods =
(struct smbus_methods_t *) id->driver_data;
acpi_walk_namespace(ACPI_TYPE_METHOD, smbus_cmi->handle, 1, acpi_walk_namespace(ACPI_TYPE_METHOD, smbus_cmi->handle, 1,
acpi_smbus_cmi_query_methods, NULL, smbus_cmi, NULL); acpi_smbus_cmi_query_methods, NULL, smbus_cmi, NULL);
@ -390,8 +384,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device)
} }
snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name), snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name),
"SMBus CMI adapter %s", "SMBus CMI adapter %s", dev_name(dev));
acpi_device_name(device));
smbus_cmi->adapter.owner = THIS_MODULE; smbus_cmi->adapter.owner = THIS_MODULE;
smbus_cmi->adapter.algo = &acpi_smbus_cmi_algorithm; smbus_cmi->adapter.algo = &acpi_smbus_cmi_algorithm;
smbus_cmi->adapter.algo_data = smbus_cmi; smbus_cmi->adapter.algo_data = smbus_cmi;
@ -408,31 +401,28 @@ static int acpi_smbus_cmi_add(struct acpi_device *device)
err: err:
kfree(smbus_cmi); kfree(smbus_cmi);
device->driver_data = NULL;
return ret; return ret;
} }
static int acpi_smbus_cmi_remove(struct acpi_device *device) static int smbus_cmi_remove(struct platform_device *device)
{ {
struct acpi_smbus_cmi *smbus_cmi = acpi_driver_data(device); struct acpi_smbus_cmi *smbus_cmi = platform_get_drvdata(device);
i2c_del_adapter(&smbus_cmi->adapter); i2c_del_adapter(&smbus_cmi->adapter);
kfree(smbus_cmi); kfree(smbus_cmi);
device->driver_data = NULL;
return 0; return 0;
} }
static struct acpi_driver acpi_smbus_cmi_driver = { static struct platform_driver smbus_cmi_driver = {
.name = ACPI_SMBUS_HC_DEVICE_NAME, .probe = smbus_cmi_probe,
.class = ACPI_SMBUS_HC_CLASS, .remove = smbus_cmi_remove,
.ids = acpi_smbus_cmi_ids, .driver = {
.ops = { .name = "smbus_cmi",
.add = acpi_smbus_cmi_add, .acpi_match_table = acpi_smbus_cmi_ids,
.remove = acpi_smbus_cmi_remove,
}, },
}; };
module_acpi_driver(acpi_smbus_cmi_driver); module_platform_driver(smbus_cmi_driver);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_AUTHOR("Crane Cai <crane.cai@amd.com>"); MODULE_AUTHOR("Crane Cai <crane.cai@amd.com>");