linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
Subject: [PATCH linux-next] Driver core: cpu: remove not needed anymore hotplugable_cpu_attr_groups[]
Date: Wed, 22 May 2013 15:53:32 +0200	[thread overview]
Message-ID: <1369230812-27375-1-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <20130522140213.eb65bcc559088b199db1857f@canb.auug.org.au>

after fixing conflict between
0902a9044 "Driver core: Use generic offline/online
for CPU offline/online"

and

1c4e2d70a "cpu: make sure that cpu/online file created
before KOBJ_ADD is emitted"

there was left some not needed remnants of the last
commit, remove them since the first commit does the
same thing in another way.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
PS:
Alernative way is just to drop 1c4e2d70a if rebase of tree
is acceptable.

---
 drivers/base/cpu.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index ff97614..130ba0b 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -169,13 +169,6 @@ static const struct attribute_group *common_cpu_attr_groups[] = {
 	NULL
 };
 
-static const struct attribute_group *hotplugable_cpu_attr_groups[] = {
-#ifdef CONFIG_KEXEC
-	&crash_note_cpu_attr_group,
-#endif
-	NULL
-};
-
 /*
  * Print cpu online, possible, present, and system maps
  */
@@ -292,8 +285,6 @@ int __cpuinit register_cpu(struct cpu *cpu, int num)
 	cpu->dev.bus->uevent = arch_cpu_uevent;
 #endif
 	cpu->dev.groups = common_cpu_attr_groups;
-	if (cpu->hotpluggable)
-		cpu->dev.groups = hotplugable_cpu_attr_groups;
 	error = device_register(&cpu->dev);
 	if (!error)
 		per_cpu(cpu_sys_devices, num) = &cpu->dev;
-- 
1.7.1

  parent reply	other threads:[~2013-05-22 13:57 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-22  3:47 linux-next: manual merge of the driver-core tree with the pm tree Stephen Rothwell
2013-05-22  4:02 ` Stephen Rothwell
2013-05-22 11:26   ` Rafael J. Wysocki
2013-05-22 13:53   ` Igor Mammedov [this message]
2013-05-23  0:32     ` [PATCH linux-next] Driver core: cpu: remove not needed anymore hotplugable_cpu_attr_groups[] Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369230812-27375-1-git-send-email-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).