Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 111e95a4 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

[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: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d7b60489

drivers/s390/cio/device.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1179,12 +1179,6 @@ static int io_subchannel_probe(struct subchannel *sch) 
		return 0;

		return 0;

	}

	}

	io_subchannel_init_fields(sch);

	io_subchannel_init_fields(sch);

	/*

	 * First check if a fitting device may be found amongst the

	 * disconnected devices or in the orphanage.

	 */

	dev_id.devno = sch->schib.pmcw.dev;

	dev_id.ssid = sch->schid.ssid;

	rc = sysfs_create_group(&sch->dev.kobj,

	rc = sysfs_create_group(&sch->dev.kobj,

				&io_subchannel_attr_group);

				&io_subchannel_attr_group);

	if (rc)

	if (rc)
@@ -1196,6 +1190,12 @@ static int io_subchannel_probe(struct subchannel *sch) 
		rc = -ENOMEM;

		rc = -ENOMEM;

		goto out_err;

		goto out_err;

	}

	}

	/*

	 * First check if a fitting device may be found amongst the

	 * disconnected devices or in the orphanage.

	 */

	dev_id.devno = sch->schib.pmcw.dev;

	dev_id.ssid = sch->schid.ssid;

	cdev = get_disc_ccwdev_by_dev_id(&dev_id, NULL);

	cdev = get_disc_ccwdev_by_dev_id(&dev_id, NULL);

	if (!cdev)

	if (!cdev)

		cdev = get_orphaned_ccwdev_by_dev_id(to_css(sch->dev.parent),

		cdev = get_orphaned_ccwdev_by_dev_id(to_css(sch->dev.parent),