From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755558AbbJUQGq (ORCPT ); Wed, 21 Oct 2015 12:06:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44563 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755408AbbJUQGn (ORCPT ); Wed, 21 Oct 2015 12:06:43 -0400 From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: trenn@suse.de, Prarit Bhargava , Greg Kroah-Hartman Subject: [PATCH 2/2] base, cpu, remove hotplugable_cpu_attr_groups Date: Wed, 21 Oct 2015 12:06:38 -0400 Message-Id: <1445443598-21036-3-git-send-email-prarit@redhat.com> In-Reply-To: <1445443598-21036-1-git-send-email-prarit@redhat.com> References: <1445443598-21036-1-git-send-email-prarit@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 CC: Thomas Renninger Signed-off-by: Prarit Bhargava --- 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