[PATCH 2/2] base, cpu, remove hotplugable_cpu_attr_groups
From: Prarit Bhargava
Date: Wed Oct 21 2015 - 12:06:49 EST
hotplugable_cpu_attr_groups is not different from common_cpu_attr_groups,
and can be removed. This patchset renames common_cpu_attr_groups to
cpu_attr_groups.
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
CC: Thomas Renninger <trenn@xxxxxxx>
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
---
drivers/base/cpu.c | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 9c30782..8520c68 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -309,17 +309,7 @@ out:
device_initcall(topology_sysfs_init);
#endif
-static const struct attribute_group *common_cpu_attr_groups[] = {
-#ifdef CONFIG_KEXEC
- &crash_note_cpu_attr_group,
-#endif
-#ifdef CONFIG_PERMANENT_CPU_TOPOLOGY
- &topology_attr_group,
-#endif
- NULL
-};
-
-static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
+static const struct attribute_group *cpu_attr_groups[] = {
#ifdef CONFIG_KEXEC
&crash_note_cpu_attr_group,
#endif
@@ -502,9 +492,7 @@ int register_cpu(struct cpu *cpu, int num)
#ifdef CONFIG_GENERIC_CPU_AUTOPROBE
cpu->dev.bus->uevent = cpu_uevent;
#endif
- cpu->dev.groups = common_cpu_attr_groups;
- if (cpu->hotpluggable)
- cpu->dev.groups = hotplugable_cpu_attr_groups;
+ cpu->dev.groups = cpu_attr_groups;
error = device_register(&cpu->dev);
if (!error)
per_cpu(cpu_sys_devices, num) = &cpu->dev;
--
1.7.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/