From 53faa61af3431d7fbd3e0895d08b1a9269e92e6f Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Sat, 13 Apr 2013 12:58:55 +0200
Subject: [PATCH] --- yaml --- r: 362785 b: refs/heads/master c:
 c135ad1caffe2b35d6316758a605a2b63ca22bb3 h: refs/heads/master i:   362783:
 55514e9f568600184fac27c4796130c071622ffa v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/s390/cio/css.c | 37 ++++++++++++++++++------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index d0dbcb7166f0..cdb001127de5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f10ccca7a555f5e80ed7ecff58e7dfdab03860da
+refs/heads/master: c135ad1caffe2b35d6316758a605a2b63ca22bb3
diff --git a/trunk/drivers/s390/cio/css.c b/trunk/drivers/s390/cio/css.c
index 658d9349c837..8a1294b1cbaf 100644
--- a/trunk/drivers/s390/cio/css.c
+++ b/trunk/drivers/s390/cio/css.c
@@ -137,8 +137,21 @@ int for_each_subchannel_staged(int (*fn_known)(struct subchannel *, void *),
 
 static void css_sch_todo(struct work_struct *work);
 
-static struct subchannel *
-css_alloc_subchannel(struct subchannel_id schid)
+static void css_subchannel_release(struct device *dev)
+{
+	struct subchannel *sch;
+
+	sch = to_subchannel(dev);
+	if (!cio_is_console(sch->schid)) {
+		/* Reset intparm to zeroes. */
+		sch->config.intparm = 0;
+		cio_commit_config(sch);
+		kfree(sch->lock);
+		kfree(sch);
+	}
+}
+
+static struct subchannel *css_alloc_subchannel(struct subchannel_id schid)
 {
 	struct subchannel *sch;
 	int ret;
@@ -152,24 +165,11 @@ css_alloc_subchannel(struct subchannel_id schid)
 		return ERR_PTR(ret);
 	}
 	INIT_WORK(&sch->todo_work, css_sch_todo);
+	sch->dev.release = &css_subchannel_release;
+	device_initialize(&sch->dev);
 	return sch;
 }
 
-static void
-css_subchannel_release(struct device *dev)
-{
-	struct subchannel *sch;
-
-	sch = to_subchannel(dev);
-	if (!cio_is_console(sch->schid)) {
-		/* Reset intparm to zeroes. */
-		sch->config.intparm = 0;
-		cio_commit_config(sch);
-		kfree(sch->lock);
-		kfree(sch);
-	}
-}
-
 static int css_sch_device_register(struct subchannel *sch)
 {
 	int ret;
@@ -177,7 +177,7 @@ static int css_sch_device_register(struct subchannel *sch)
 	mutex_lock(&sch->reg_mutex);
 	dev_set_name(&sch->dev, "0.%x.%04x", sch->schid.ssid,
 		     sch->schid.sch_no);
-	ret = device_register(&sch->dev);
+	ret = device_add(&sch->dev);
 	mutex_unlock(&sch->reg_mutex);
 	return ret;
 }
@@ -282,7 +282,6 @@ static int css_register_subchannel(struct subchannel *sch)
 	/* Initialize the subchannel structure */
 	sch->dev.parent = &channel_subsystems[0]->device;
 	sch->dev.bus = &css_bus_type;
-	sch->dev.release = &css_subchannel_release;
 	sch->dev.groups = default_subch_attr_groups;
 	/*
 	 * We don't want to generate uevents for I/O subchannels that don't