aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2008-12-25 07:39:03 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-12-25 07:39:06 -0500
commit111e95a4cae01d6dadbbd1d8ab28dcd10fa5619c (patch)
tree635b0c09a894f977273a47def739b488782e750b /drivers/s390
parentd7b604891b7ce7de93e3758ec6b3b7b7964e1884 (diff)
[S390] cio: move irritating comment.
Due to former patches a comment and device id initialization were split from the addressed function call in io_subchannel_probe. Move it back to where it belongs. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/cio/device.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index fac85160a753..fc0c0abd1271 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1179,12 +1179,6 @@ static int io_subchannel_probe(struct subchannel *sch)
1179 return 0; 1179 return 0;
1180 } 1180 }
1181 io_subchannel_init_fields(sch); 1181 io_subchannel_init_fields(sch);
1182 /*
1183 * First check if a fitting device may be found amongst the
1184 * disconnected devices or in the orphanage.
1185 */
1186 dev_id.devno = sch->schib.pmcw.dev;
1187 dev_id.ssid = sch->schid.ssid;
1188 rc = sysfs_create_group(&sch->dev.kobj, 1182 rc = sysfs_create_group(&sch->dev.kobj,
1189 &io_subchannel_attr_group); 1183 &io_subchannel_attr_group);
1190 if (rc) 1184 if (rc)
@@ -1196,6 +1190,12 @@ static int io_subchannel_probe(struct subchannel *sch)
1196 rc = -ENOMEM; 1190 rc = -ENOMEM;
1197 goto out_err; 1191 goto out_err;
1198 } 1192 }
1193 /*
1194 * First check if a fitting device may be found amongst the
1195 * disconnected devices or in the orphanage.
1196 */
1197 dev_id.devno = sch->schib.pmcw.dev;
1198 dev_id.ssid = sch->schid.ssid;
1199 cdev = get_disc_ccwdev_by_dev_id(&dev_id, NULL); 1199 cdev = get_disc_ccwdev_by_dev_id(&dev_id, NULL);
1200 if (!cdev) 1200 if (!cdev)
1201 cdev = get_orphaned_ccwdev_by_dev_id(to_css(sch->dev.parent), 1201 cdev = get_orphaned_ccwdev_by_dev_id(to_css(sch->dev.parent),