| Message ID | 20200414020953.255364-1-matthewgarrett@google.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
| Series | [V2,1/3] thermal/int340x_thermal: Export GDDV | expand |
On Mon, 2020-04-13 at 19:09 -0700, Matthew Garrett wrote: > From: Matthew Garrett <mjg59@google.com> > > Implementing DPTF properly requires making use of firmware-provided > information associated with the INT3400 device. Calling GDDV provides > a > buffer of information which userland can then interpret to determine > appropriate DPTF policy. > Anything changed in v2 series? Thanks, Srinivas > Signed-off-by: Matthew Garrett <mjg59@google.com> > --- > .../intel/int340x_thermal/int3400_thermal.c | 60 > +++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > index ceef89c956bd4..00a7732724cd0 100644 > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > @@ -52,6 +52,25 @@ struct int3400_thermal_priv { > u8 uuid_bitmap; > int rel_misc_dev_res; > int current_uuid_index; > + char *data_vault; > +}; > + > +static ssize_t data_vault_read(struct file *file, struct kobject > *kobj, > + struct bin_attribute *attr, char *buf, loff_t off, size_t > count) > +{ > + memcpy(buf, attr->private + off, count); > + return count; > +} > + > +static BIN_ATTR_RO(data_vault, 0); > + > +static struct bin_attribute *data_attributes[] = { > + &bin_attr_data_vault, > + NULL, > +}; > + > +static const struct attribute_group data_attribute_group = { > + .bin_attrs = data_attributes, > }; > > static ssize_t available_uuids_show(struct device *dev, > @@ -278,6 +297,32 @@ static struct thermal_zone_params > int3400_thermal_params = { > .no_hwmon = true, > }; > > +static void int3400_setup_gddv(struct int3400_thermal_priv *priv) > +{ > + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; > + union acpi_object *obj; > + acpi_status status; > + > + status = acpi_evaluate_object(priv->adev->handle, "GDDV", NULL, > + &buffer); > + if (ACPI_FAILURE(status) || !buffer.length) > + return; > + > + obj = buffer.pointer; > + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1 > + || obj->package.elements[0].type != ACPI_TYPE_BUFFER) { > + kfree(buffer.pointer); > + return; > + } > + > + priv->data_vault = kmemdup(obj- > >package.elements[0].buffer.pointer, > + obj- > >package.elements[0].buffer.length, > + GFP_KERNEL); > + bin_attr_data_vault.private = priv->data_vault; > + bin_attr_data_vault.size = obj- > >package.elements[0].buffer.length; > + kfree(buffer.pointer); > +} > + > static int int3400_thermal_probe(struct platform_device *pdev) > { > struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); > @@ -309,6 +354,8 @@ static int int3400_thermal_probe(struct > platform_device *pdev) > > platform_set_drvdata(pdev, priv); > > + int3400_setup_gddv(priv); > + > int3400_thermal_ops.get_mode = int3400_thermal_get_mode; > int3400_thermal_ops.set_mode = int3400_thermal_set_mode; > > @@ -327,6 +374,13 @@ static int int3400_thermal_probe(struct > platform_device *pdev) > if (result) > goto free_rel_misc; > > + if (priv->data_vault) { > + result = sysfs_create_group(&pdev->dev.kobj, > + &data_attribute_group); > + if (result) > + goto free_uuid; > + } > + > result = acpi_install_notify_handler( > priv->adev->handle, ACPI_DEVICE_NOTIFY, > int3400_notify, > (void *)priv); > @@ -336,6 +390,9 @@ static int int3400_thermal_probe(struct > platform_device *pdev) > return 0; > > free_sysfs: > + if (priv->data_vault) > + sysfs_remove_group(&pdev->dev.kobj, > &data_attribute_group); > +free_uuid: > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > free_rel_misc: > if (!priv->rel_misc_dev_res) > @@ -360,8 +417,11 @@ static int int3400_thermal_remove(struct > platform_device *pdev) > if (!priv->rel_misc_dev_res) > acpi_thermal_rel_misc_device_remove(priv->adev- > >handle); > > + if (priv->data_vault) > + sysfs_remove_group(&pdev->dev.kobj, > &data_attribute_group); > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > thermal_zone_device_unregister(priv->thermal); > + kfree(priv->data_vault); > kfree(priv->trts); > kfree(priv->arts); > kfree(priv);
On Mon, Apr 13, 2020 at 8:33 PM Pandruvada, Srinivas
<srinivas.pandruvada@intel.com> wrote:
> Anything changed in v2 series?
Sorry, forgot to explain the diffs. Patch 2 in V2 was passing the
wrong value to sysfs_attr_init(), but I didn't notice during testing
because that's a macro that does nothing unless a specific debug flag
is set. The kernel build bot noticed. Only difference is passing the
correct argument there.
On Mon, 2020-04-13 at 20:53 -0700, Matthew Garrett wrote: > On Mon, Apr 13, 2020 at 8:33 PM Pandruvada, Srinivas > <srinivas.pandruvada@intel.com> wrote: > > Anything changed in v2 series? > > Sorry, forgot to explain the diffs. Patch 2 in V2 was passing the > wrong value to sysfs_attr_init(), but I didn't notice during testing > because that's a macro that does nothing unless a specific debug flag > is set. The kernel build bot noticed. Only difference is passing the > correct argument there. Thanks. I will give a try next week. -Srinivas
On Mon, 2020-04-13 at 19:09 -0700, Matthew Garrett wrote: > From: Matthew Garrett <mjg59@google.com> > > Implementing DPTF properly requires making use of firmware-provided > information associated with the INT3400 device. Calling GDDV provides > a > buffer of information which userland can then interpret to determine > appropriate DPTF policy. > > Signed-off-by: Matthew Garrett <mjg59@google.com> Tested-by: Pandruvada, Srinivas <srinivas.pandruvada@linux.intel.com> > --- > .../intel/int340x_thermal/int3400_thermal.c | 60 > +++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > index ceef89c956bd4..00a7732724cd0 100644 > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > @@ -52,6 +52,25 @@ struct int3400_thermal_priv { > u8 uuid_bitmap; > int rel_misc_dev_res; > int current_uuid_index; > + char *data_vault; > +}; > + > +static ssize_t data_vault_read(struct file *file, struct kobject > *kobj, > + struct bin_attribute *attr, char *buf, loff_t off, size_t > count) > +{ > + memcpy(buf, attr->private + off, count); > + return count; > +} > + > +static BIN_ATTR_RO(data_vault, 0); > + > +static struct bin_attribute *data_attributes[] = { > + &bin_attr_data_vault, > + NULL, > +}; > + > +static const struct attribute_group data_attribute_group = { > + .bin_attrs = data_attributes, > }; > > static ssize_t available_uuids_show(struct device *dev, > @@ -278,6 +297,32 @@ static struct thermal_zone_params > int3400_thermal_params = { > .no_hwmon = true, > }; > > +static void int3400_setup_gddv(struct int3400_thermal_priv *priv) > +{ > + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; > + union acpi_object *obj; > + acpi_status status; > + > + status = acpi_evaluate_object(priv->adev->handle, "GDDV", NULL, > + &buffer); > + if (ACPI_FAILURE(status) || !buffer.length) > + return; > + > + obj = buffer.pointer; > + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1 > + || obj->package.elements[0].type != ACPI_TYPE_BUFFER) { > + kfree(buffer.pointer); > + return; > + } > + > + priv->data_vault = kmemdup(obj- > >package.elements[0].buffer.pointer, > + obj- > >package.elements[0].buffer.length, > + GFP_KERNEL); > + bin_attr_data_vault.private = priv->data_vault; > + bin_attr_data_vault.size = obj- > >package.elements[0].buffer.length; > + kfree(buffer.pointer); > +} > + > static int int3400_thermal_probe(struct platform_device *pdev) > { > struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); > @@ -309,6 +354,8 @@ static int int3400_thermal_probe(struct > platform_device *pdev) > > platform_set_drvdata(pdev, priv); > > + int3400_setup_gddv(priv); > + > int3400_thermal_ops.get_mode = int3400_thermal_get_mode; > int3400_thermal_ops.set_mode = int3400_thermal_set_mode; > > @@ -327,6 +374,13 @@ static int int3400_thermal_probe(struct > platform_device *pdev) > if (result) > goto free_rel_misc; > > + if (priv->data_vault) { > + result = sysfs_create_group(&pdev->dev.kobj, > + &data_attribute_group); > + if (result) > + goto free_uuid; > + } > + > result = acpi_install_notify_handler( > priv->adev->handle, ACPI_DEVICE_NOTIFY, > int3400_notify, > (void *)priv); > @@ -336,6 +390,9 @@ static int int3400_thermal_probe(struct > platform_device *pdev) > return 0; > > free_sysfs: > + if (priv->data_vault) > + sysfs_remove_group(&pdev->dev.kobj, > &data_attribute_group); > +free_uuid: > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > free_rel_misc: > if (!priv->rel_misc_dev_res) > @@ -360,8 +417,11 @@ static int int3400_thermal_remove(struct > platform_device *pdev) > if (!priv->rel_misc_dev_res) > acpi_thermal_rel_misc_device_remove(priv->adev- > >handle); > > + if (priv->data_vault) > + sysfs_remove_group(&pdev->dev.kobj, > &data_attribute_group); > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > thermal_zone_device_unregister(priv->thermal); > + kfree(priv->data_vault); > kfree(priv->trts); > kfree(priv->arts); > kfree(priv);
On Mon, 2020-05-18 at 23:18 +0000, Pandruvada, Srinivas wrote: > On Mon, 2020-04-13 at 19:09 -0700, Matthew Garrett wrote: > > From: Matthew Garrett <mjg59@google.com> > > > > Implementing DPTF properly requires making use of firmware-provided > > information associated with the INT3400 device. Calling GDDV > > provides > > a > > buffer of information which userland can then interpret to > > determine > > appropriate DPTF policy. > > > > Signed-off-by: Matthew Garrett <mjg59@google.com> > Tested-by: Pandruvada, Srinivas <srinivas.pandruvada@linux.intel.com> Can we take this series for 5.8? Thanks, Srinivas > > > --- > > .../intel/int340x_thermal/int3400_thermal.c | 60 > > +++++++++++++++++++ > > 1 file changed, 60 insertions(+) > > > > diff --git > > a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > index ceef89c956bd4..00a7732724cd0 100644 > > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > @@ -52,6 +52,25 @@ struct int3400_thermal_priv { > > u8 uuid_bitmap; > > int rel_misc_dev_res; > > int current_uuid_index; > > + char *data_vault; > > +}; > > + > > +static ssize_t data_vault_read(struct file *file, struct kobject > > *kobj, > > + struct bin_attribute *attr, char *buf, loff_t off, size_t > > count) > > +{ > > + memcpy(buf, attr->private + off, count); > > + return count; > > +} > > + > > +static BIN_ATTR_RO(data_vault, 0); > > + > > +static struct bin_attribute *data_attributes[] = { > > + &bin_attr_data_vault, > > + NULL, > > +}; > > + > > +static const struct attribute_group data_attribute_group = { > > + .bin_attrs = data_attributes, > > }; > > > > static ssize_t available_uuids_show(struct device *dev, > > @@ -278,6 +297,32 @@ static struct thermal_zone_params > > int3400_thermal_params = { > > .no_hwmon = true, > > }; > > > > +static void int3400_setup_gddv(struct int3400_thermal_priv *priv) > > +{ > > + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; > > + union acpi_object *obj; > > + acpi_status status; > > + > > + status = acpi_evaluate_object(priv->adev->handle, "GDDV", NULL, > > + &buffer); > > + if (ACPI_FAILURE(status) || !buffer.length) > > + return; > > + > > + obj = buffer.pointer; > > + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1 > > + || obj->package.elements[0].type != ACPI_TYPE_BUFFER) { > > + kfree(buffer.pointer); > > + return; > > + } > > + > > + priv->data_vault = kmemdup(obj- > > > package.elements[0].buffer.pointer, > > + obj- > > > package.elements[0].buffer.length, > > + GFP_KERNEL); > > + bin_attr_data_vault.private = priv->data_vault; > > + bin_attr_data_vault.size = obj- > > > package.elements[0].buffer.length; > > + kfree(buffer.pointer); > > +} > > + > > static int int3400_thermal_probe(struct platform_device *pdev) > > { > > struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); > > @@ -309,6 +354,8 @@ static int int3400_thermal_probe(struct > > platform_device *pdev) > > > > platform_set_drvdata(pdev, priv); > > > > + int3400_setup_gddv(priv); > > + > > int3400_thermal_ops.get_mode = int3400_thermal_get_mode; > > int3400_thermal_ops.set_mode = int3400_thermal_set_mode; > > > > @@ -327,6 +374,13 @@ static int int3400_thermal_probe(struct > > platform_device *pdev) > > if (result) > > goto free_rel_misc; > > > > + if (priv->data_vault) { > > + result = sysfs_create_group(&pdev->dev.kobj, > > + &data_attribute_group); > > + if (result) > > + goto free_uuid; > > + } > > + > > result = acpi_install_notify_handler( > > priv->adev->handle, ACPI_DEVICE_NOTIFY, > > int3400_notify, > > (void *)priv); > > @@ -336,6 +390,9 @@ static int int3400_thermal_probe(struct > > platform_device *pdev) > > return 0; > > > > free_sysfs: > > + if (priv->data_vault) > > + sysfs_remove_group(&pdev->dev.kobj, > > &data_attribute_group); > > +free_uuid: > > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > > free_rel_misc: > > if (!priv->rel_misc_dev_res) > > @@ -360,8 +417,11 @@ static int int3400_thermal_remove(struct > > platform_device *pdev) > > if (!priv->rel_misc_dev_res) > > acpi_thermal_rel_misc_device_remove(priv->adev- > > > handle); > > > > + if (priv->data_vault) > > + sysfs_remove_group(&pdev->dev.kobj, > > &data_attribute_group); > > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > > thermal_zone_device_unregister(priv->thermal); > > + kfree(priv->data_vault); > > kfree(priv->trts); > > kfree(priv->arts); > > kfree(priv);
On Fri, 2020-05-29 at 00:00 -0600, Pandruvada, Srinivas wrote: > On Mon, 2020-05-18 at 23:18 +0000, Pandruvada, Srinivas wrote: > > On Mon, 2020-04-13 at 19:09 -0700, Matthew Garrett wrote: > > > From: Matthew Garrett <mjg59@google.com> > > > > > > Implementing DPTF properly requires making use of firmware- > > > provided > > > information associated with the INT3400 device. Calling GDDV > > > provides > > > a > > > buffer of information which userland can then interpret to > > > determine > > > appropriate DPTF policy. > > > > > > Signed-off-by: Matthew Garrett <mjg59@google.com> > > > > Tested-by: Pandruvada, Srinivas < > > srinivas.pandruvada@linux.intel.com> > > Can we take this series for 5.8? They are in testing branch and has just passed the build test, will queue them for 5.8. thanks, rui > > Thanks, > Srinivas > > > > > > --- > > > .../intel/int340x_thermal/int3400_thermal.c | 60 > > > +++++++++++++++++++ > > > 1 file changed, 60 insertions(+) > > > > > > diff --git > > > a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > > b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > > index ceef89c956bd4..00a7732724cd0 100644 > > > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > > > @@ -52,6 +52,25 @@ struct int3400_thermal_priv { > > > u8 uuid_bitmap; > > > int rel_misc_dev_res; > > > int current_uuid_index; > > > + char *data_vault; > > > +}; > > > + > > > +static ssize_t data_vault_read(struct file *file, struct kobject > > > *kobj, > > > + struct bin_attribute *attr, char *buf, loff_t off, size_t > > > count) > > > +{ > > > + memcpy(buf, attr->private + off, count); > > > + return count; > > > +} > > > + > > > +static BIN_ATTR_RO(data_vault, 0); > > > + > > > +static struct bin_attribute *data_attributes[] = { > > > + &bin_attr_data_vault, > > > + NULL, > > > +}; > > > + > > > +static const struct attribute_group data_attribute_group = { > > > + .bin_attrs = data_attributes, > > > }; > > > > > > static ssize_t available_uuids_show(struct device *dev, > > > @@ -278,6 +297,32 @@ static struct thermal_zone_params > > > int3400_thermal_params = { > > > .no_hwmon = true, > > > }; > > > > > > +static void int3400_setup_gddv(struct int3400_thermal_priv > > > *priv) > > > +{ > > > + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; > > > + union acpi_object *obj; > > > + acpi_status status; > > > + > > > + status = acpi_evaluate_object(priv->adev->handle, "GDDV", NULL, > > > + &buffer); > > > + if (ACPI_FAILURE(status) || !buffer.length) > > > + return; > > > + > > > + obj = buffer.pointer; > > > + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1 > > > + || obj->package.elements[0].type != ACPI_TYPE_BUFFER) { > > > + kfree(buffer.pointer); > > > + return; > > > + } > > > + > > > + priv->data_vault = kmemdup(obj- > > > > package.elements[0].buffer.pointer, > > > > > > + obj- > > > > package.elements[0].buffer.length, > > > > > > + GFP_KERNEL); > > > + bin_attr_data_vault.private = priv->data_vault; > > > + bin_attr_data_vault.size = obj- > > > > package.elements[0].buffer.length; > > > > > > + kfree(buffer.pointer); > > > +} > > > + > > > static int int3400_thermal_probe(struct platform_device *pdev) > > > { > > > struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); > > > @@ -309,6 +354,8 @@ static int int3400_thermal_probe(struct > > > platform_device *pdev) > > > > > > platform_set_drvdata(pdev, priv); > > > > > > + int3400_setup_gddv(priv); > > > + > > > int3400_thermal_ops.get_mode = int3400_thermal_get_mode; > > > int3400_thermal_ops.set_mode = int3400_thermal_set_mode; > > > > > > @@ -327,6 +374,13 @@ static int int3400_thermal_probe(struct > > > platform_device *pdev) > > > if (result) > > > goto free_rel_misc; > > > > > > + if (priv->data_vault) { > > > + result = sysfs_create_group(&pdev->dev.kobj, > > > + &data_attribute_group); > > > + if (result) > > > + goto free_uuid; > > > + } > > > + > > > result = acpi_install_notify_handler( > > > priv->adev->handle, ACPI_DEVICE_NOTIFY, > > > int3400_notify, > > > (void *)priv); > > > @@ -336,6 +390,9 @@ static int int3400_thermal_probe(struct > > > platform_device *pdev) > > > return 0; > > > > > > free_sysfs: > > > + if (priv->data_vault) > > > + sysfs_remove_group(&pdev->dev.kobj, > > > &data_attribute_group); > > > +free_uuid: > > > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > > > free_rel_misc: > > > if (!priv->rel_misc_dev_res) > > > @@ -360,8 +417,11 @@ static int int3400_thermal_remove(struct > > > platform_device *pdev) > > > if (!priv->rel_misc_dev_res) > > > acpi_thermal_rel_misc_device_remove(priv->adev- > > > > handle); > > > > > > > > > + if (priv->data_vault) > > > + sysfs_remove_group(&pdev->dev.kobj, > > > &data_attribute_group); > > > sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); > > > thermal_zone_device_unregister(priv->thermal); > > > + kfree(priv->data_vault); > > > kfree(priv->trts); > > > kfree(priv->arts); > > > kfree(priv);
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index ceef89c956bd4..00a7732724cd0 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -52,6 +52,25 @@ struct int3400_thermal_priv { u8 uuid_bitmap; int rel_misc_dev_res; int current_uuid_index; + char *data_vault; +}; + +static ssize_t data_vault_read(struct file *file, struct kobject *kobj, + struct bin_attribute *attr, char *buf, loff_t off, size_t count) +{ + memcpy(buf, attr->private + off, count); + return count; +} + +static BIN_ATTR_RO(data_vault, 0); + +static struct bin_attribute *data_attributes[] = { + &bin_attr_data_vault, + NULL, +}; + +static const struct attribute_group data_attribute_group = { + .bin_attrs = data_attributes, }; static ssize_t available_uuids_show(struct device *dev, @@ -278,6 +297,32 @@ static struct thermal_zone_params int3400_thermal_params = { .no_hwmon = true, }; +static void int3400_setup_gddv(struct int3400_thermal_priv *priv) +{ + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *obj; + acpi_status status; + + status = acpi_evaluate_object(priv->adev->handle, "GDDV", NULL, + &buffer); + if (ACPI_FAILURE(status) || !buffer.length) + return; + + obj = buffer.pointer; + if (obj->type != ACPI_TYPE_PACKAGE || obj->package.count != 1 + || obj->package.elements[0].type != ACPI_TYPE_BUFFER) { + kfree(buffer.pointer); + return; + } + + priv->data_vault = kmemdup(obj->package.elements[0].buffer.pointer, + obj->package.elements[0].buffer.length, + GFP_KERNEL); + bin_attr_data_vault.private = priv->data_vault; + bin_attr_data_vault.size = obj->package.elements[0].buffer.length; + kfree(buffer.pointer); +} + static int int3400_thermal_probe(struct platform_device *pdev) { struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); @@ -309,6 +354,8 @@ static int int3400_thermal_probe(struct platform_device *pdev) platform_set_drvdata(pdev, priv); + int3400_setup_gddv(priv); + int3400_thermal_ops.get_mode = int3400_thermal_get_mode; int3400_thermal_ops.set_mode = int3400_thermal_set_mode; @@ -327,6 +374,13 @@ static int int3400_thermal_probe(struct platform_device *pdev) if (result) goto free_rel_misc; + if (priv->data_vault) { + result = sysfs_create_group(&pdev->dev.kobj, + &data_attribute_group); + if (result) + goto free_uuid; + } + result = acpi_install_notify_handler( priv->adev->handle, ACPI_DEVICE_NOTIFY, int3400_notify, (void *)priv); @@ -336,6 +390,9 @@ static int int3400_thermal_probe(struct platform_device *pdev) return 0; free_sysfs: + if (priv->data_vault) + sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group); +free_uuid: sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); free_rel_misc: if (!priv->rel_misc_dev_res) @@ -360,8 +417,11 @@ static int int3400_thermal_remove(struct platform_device *pdev) if (!priv->rel_misc_dev_res) acpi_thermal_rel_misc_device_remove(priv->adev->handle); + if (priv->data_vault) + sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group); sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group); thermal_zone_device_unregister(priv->thermal); + kfree(priv->data_vault); kfree(priv->trts); kfree(priv->arts); kfree(priv);