Commit 17f18417 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Rafael J. Wysocki
Browse files

ACPI: sysfs: use default_groups in kobj_type 



There are currently 2 ways to create a set of sysfs files for a
kobj_type, through the default_attrs field, and the default_groups
field.  Move the ACPI sysfs code to use default_groups field which has
been the preferred way since aa30f47c ("kobject: Add support for
default attribute groups to kobj_type") so that we can soon get rid of
the obsolete default_attrs field.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent fc74e0a4

drivers/acpi/cppc_acpi.c

+2 −1
Original line number Diff line number Diff line
@@ -179,10 +179,11 @@ static struct attribute *cppc_attrs[] = { 
	&lowest_freq.attr,

	NULL

};

ATTRIBUTE_GROUPS(cppc);



static struct kobj_type cppc_ktype = {

	.sysfs_ops = &kobj_sysfs_ops,

	.default_attrs = cppc_attrs,

	.default_groups = cppc_groups,

};



static int check_pcc_chan(int pcc_ss_id, bool chk_err_bit)

drivers/acpi/device_sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static struct attribute *acpi_data_node_default_attrs[] = { 
	&data_node_path.attr,

	NULL

};

ATTRIBUTE_GROUPS(acpi_data_node_default);



#define to_data_node(k) container_of(k, struct acpi_data_node, kobj)

#define to_attr(a) container_of(a, struct acpi_data_node_attr, attr)
@@ -79,7 +80,7 @@ static void acpi_data_node_release(struct kobject *kobj) 


static struct kobj_type acpi_data_node_ktype = {

	.sysfs_ops = &acpi_data_node_sysfs_ops,

	.default_attrs = acpi_data_node_default_attrs,

	.default_groups = acpi_data_node_default_groups,

	.release = acpi_data_node_release,

};

drivers/acpi/sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -939,10 +939,11 @@ static struct attribute *hotplug_profile_attrs[] = { 
	&hotplug_enabled_attr.attr,

	NULL

};

ATTRIBUTE_GROUPS(hotplug_profile);



static struct kobj_type acpi_hotplug_profile_ktype = {

	.sysfs_ops = &kobj_sysfs_ops,

	.default_attrs = hotplug_profile_attrs,

	.default_groups = hotplug_profile_groups,

};



void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,