From f8425790ce936334648719ee8a49c77ccea9a2ce Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Mon, 4 Jun 2012 19:29:41 +0200
Subject: [PATCH] --- yaml --- r: 313855 b: refs/heads/master c:
 ed35ba9af4f40056a222dd7b67f39f1f6172185a h: refs/heads/master i:   313853:
 c4f0a595f0d8d04d5399e7638c14dd90ab5e79d0   313851:
 8e2dbeb7d5bd19555ea31374ddac63366ee6b317   313847:
 ba1d608f811a475af70a49c9ee299ebd7c11ca3d   313839:
 fd1f217ccf22202a575cdb84daad4e64b8c8426e   313823:
 35cfb71028db95ef469619968bbe8303e4284f23   313791:
 a2693bfb56b88731db6447c3d6919e74bc8f3210   313727:
 c06015873fdd14a4ca323834c52b14795537ee36   313599:
 33d50d78adaab6149de11463acdbc9c83d61eddb   313343:
 63050c95227e116ed259ee1b3546d4d55151c917 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/s390/cio/chp.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 849d11897002..3da67f4f027b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb546195a7d8bc492ec6865980bf767474e74d87
+refs/heads/master: ed35ba9af4f40056a222dd7b67f39f1f6172185a
diff --git a/trunk/drivers/s390/cio/chp.c b/trunk/drivers/s390/cio/chp.c
index e792436c9270..9b054806f7b1 100644
--- a/trunk/drivers/s390/cio/chp.c
+++ b/trunk/drivers/s390/cio/chp.c
@@ -362,10 +362,13 @@ static struct attribute *chp_attrs[] = {
 	&dev_attr_shared.attr,
 	NULL,
 };
-
 static struct attribute_group chp_attr_group = {
 	.attrs = chp_attrs,
 };
+static const struct attribute_group *chp_attr_groups[] = {
+	&chp_attr_group,
+	NULL,
+};
 
 static void chp_release(struct device *dev)
 {
@@ -397,6 +400,7 @@ int chp_new(struct chp_id chpid)
 	chp->chpid = chpid;
 	chp->state = 1;
 	chp->dev.parent = &channel_subsystems[chpid.cssid]->device;
+	chp->dev.groups = chp_attr_groups;
 	chp->dev.release = chp_release;
 	mutex_init(&chp->lock);
 
@@ -426,16 +430,10 @@ int chp_new(struct chp_id chpid)
 		put_device(&chp->dev);
 		goto out;
 	}
-	ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
-	if (ret) {
-		device_unregister(&chp->dev);
-		goto out;
-	}
 	mutex_lock(&channel_subsystems[chpid.cssid]->mutex);
 	if (channel_subsystems[chpid.cssid]->cm_enabled) {
 		ret = chp_add_cmg_attr(chp);
 		if (ret) {
-			sysfs_remove_group(&chp->dev.kobj, &chp_attr_group);
 			device_unregister(&chp->dev);
 			mutex_unlock(&channel_subsystems[chpid.cssid]->mutex);
 			goto out;