From: Jiang Liu <jiang.liu@xxxxxxxxxx> This patch provides interfaces to attach/detach/get class driver specific data to/from ACPI hotplug slots. Signed-off-by: Jiang Liu <liuj97@xxxxxxxxx> Signed-off-by: Gaohuai Han <hangaohuai@xxxxxxxxxx> --- drivers/acpi/hotplug/core.c | 88 +++++++++++++++++++++++++++++++++++++++++++ include/acpi/acpi_hotplug.h | 8 ++++ 2 files changed, 96 insertions(+) diff --git a/drivers/acpi/hotplug/core.c b/drivers/acpi/hotplug/core.c index 14b3d61..5e78867 100644 --- a/drivers/acpi/hotplug/core.c +++ b/drivers/acpi/hotplug/core.c @@ -34,11 +34,18 @@ #include <acpi/acpi_bus.h> #include <acpi/acpi_hotplug.h> +struct acpihp_drv_data { + struct list_head node; + struct class_interface *key; + void *data; +}; + #define to_acpihp_slot(d) container_of(d, struct acpihp_slot, dev) extern struct acpi_device *acpi_root; static DEFINE_MUTEX(acpihp_mutex); +static DEFINE_MUTEX(acpihp_drvdata_mutex); static int acpihp_class_count; static struct kset *acpihp_slot_kset; @@ -407,6 +414,87 @@ char *acpihp_get_slot_type_name(enum acpihp_slot_type type) } EXPORT_SYMBOL_GPL(acpihp_get_slot_type_name); +int acpihp_slot_attach_drv_data(struct acpihp_slot *slot, + struct class_interface *drv, void *data) +{ + struct acpihp_drv_data *dp, *cp; + + if (slot == NULL || drv == NULL) { + ACPIHP_DEBUG("invalid parameters.\n"); + return -EINVAL; + } + + dp = kzalloc(sizeof(*dp), GFP_KERNEL); + if (dp == NULL) + return -ENOMEM; + + INIT_LIST_HEAD(&dp->node); + dp->key = drv; + dp->data = data; + + mutex_lock(&acpihp_drvdata_mutex); + list_for_each_entry(cp, &slot->drvdata_list, node) + if (cp->key == drv) { + mutex_unlock(&acpihp_drvdata_mutex); + kfree(dp); + return -EEXIST; + } + list_add(&dp->node, &slot->drvdata_list); + mutex_unlock(&acpihp_drvdata_mutex); + + return 0; +} +EXPORT_SYMBOL_GPL(acpihp_slot_attach_drv_data); + +int acpihp_slot_detach_drv_data(struct acpihp_slot *slot, + struct class_interface *drv, void **data) +{ + struct acpihp_drv_data *cp; + + if (slot == NULL || drv == NULL || data == NULL) { + ACPIHP_DEBUG("invalid parameters.\n"); + return -EINVAL; + } + + mutex_lock(&acpihp_drvdata_mutex); + list_for_each_entry(cp, &slot->drvdata_list, node) + if (cp->key == drv) { + list_del(&cp->node); + *data = cp->data; + mutex_unlock(&acpihp_drvdata_mutex); + kfree(cp); + return 0; + } + mutex_unlock(&acpihp_drvdata_mutex); + + return -ENOENT; +} +EXPORT_SYMBOL_GPL(acpihp_slot_detach_drv_data); + +int acpihp_slot_get_drv_data(struct acpihp_slot *slot, + struct class_interface *drv, void **data) +{ + int ret = -ENOENT; + struct acpihp_drv_data *cp; + + if (slot == NULL || drv == NULL || data == NULL) { + ACPIHP_DEBUG("invalid parameters.\n"); + return -EINVAL; + } + + mutex_lock(&acpihp_drvdata_mutex); + list_for_each_entry(cp, &slot->drvdata_list, node) + if (cp->key == drv) { + *data = cp->data; + ret = 0; + break; + } + mutex_unlock(&acpihp_drvdata_mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(acpihp_slot_get_drv_data); + /* * slot_ops should be valid during the life cycle of a slot, so no protection. */ diff --git a/include/acpi/acpi_hotplug.h b/include/acpi/acpi_hotplug.h index 2589ccb..1d43079 100644 --- a/include/acpi/acpi_hotplug.h +++ b/include/acpi/acpi_hotplug.h @@ -256,6 +256,14 @@ extern acpi_status acpihp_slot_get_capabilities(struct acpihp_slot *slot, extern acpi_status acpihp_slot_poweron(struct acpihp_slot *slot); extern acpi_status acpihp_slot_poweroff(struct acpihp_slot *slot); +/* Help routines to assoicate driver data with hotplug slot devices. */ +extern int acpihp_slot_attach_drv_data(struct acpihp_slot *slot, + struct class_interface *drv, void *data); +extern int acpihp_slot_detach_drv_data(struct acpihp_slot *slot, + struct class_interface *drv, void **data); +extern int acpihp_slot_get_drv_data(struct acpihp_slot *slot, + struct class_interface *drv, void **data); + /* * Add devices for ACPI objects connecting to an ACPI hotplug slot, * and don't cross the hotplug slot boundary. -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html