mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-08 15:39:15 +08:00
thermal: int3400: Remove unneeded data_vault attribute_group
The group only contains a single entry and the conditionals around its lifecycle make clear that this won't change. Remove the unnecessary group. This saves some memory and it's easier to read. The removal of a non-const bin_attribute[] instance is also a preparation for the constification of struct bin_attributes. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Link: https://patch.msgid.link/20241121-sysfs-const-bin_attr-int340x_thermal-v1-1-2436facf9dae@weissschuh.net Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
committed by
Rafael J. Wysocki
parent
7082503622
commit
13f3cbfbb8
@@ -75,11 +75,6 @@ struct odvp_attr {
|
||||
|
||||
static BIN_ATTR_SIMPLE_RO(data_vault);
|
||||
|
||||
static struct bin_attribute *data_attributes[] = {
|
||||
&bin_attr_data_vault,
|
||||
NULL,
|
||||
};
|
||||
|
||||
static ssize_t imok_store(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
@@ -108,10 +103,6 @@ static const struct attribute_group imok_attribute_group = {
|
||||
.attrs = imok_attr,
|
||||
};
|
||||
|
||||
static const struct attribute_group data_attribute_group = {
|
||||
.bin_attrs = data_attributes,
|
||||
};
|
||||
|
||||
static ssize_t available_uuids_show(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
@@ -624,8 +615,7 @@ static int int3400_thermal_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
if (!ZERO_OR_NULL_PTR(priv->data_vault)) {
|
||||
result = sysfs_create_group(&pdev->dev.kobj,
|
||||
&data_attribute_group);
|
||||
result = device_create_bin_file(&pdev->dev, &bin_attr_data_vault);
|
||||
if (result)
|
||||
goto free_uuid;
|
||||
}
|
||||
@@ -648,7 +638,7 @@ free_notify:
|
||||
free_sysfs:
|
||||
cleanup_odvp(priv);
|
||||
if (!ZERO_OR_NULL_PTR(priv->data_vault)) {
|
||||
sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);
|
||||
device_remove_bin_file(&pdev->dev, &bin_attr_data_vault);
|
||||
kfree(priv->data_vault);
|
||||
}
|
||||
free_uuid:
|
||||
@@ -683,7 +673,7 @@ static void int3400_thermal_remove(struct platform_device *pdev)
|
||||
acpi_thermal_rel_misc_device_remove(priv->adev->handle);
|
||||
|
||||
if (!ZERO_OR_NULL_PTR(priv->data_vault))
|
||||
sysfs_remove_group(&pdev->dev.kobj, &data_attribute_group);
|
||||
device_remove_bin_file(&pdev->dev, &bin_attr_data_vault);
|
||||
sysfs_remove_group(&pdev->dev.kobj, &uuid_attribute_group);
|
||||
sysfs_remove_group(&pdev->dev.kobj, &imok_attribute_group);
|
||||
thermal_zone_device_unregister(priv->thermal);
|
||||
|
||||
Reference in New Issue
Block a user