hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[S390] cio: change misleading console logic 

Use cio_is_console() in io_subchannel_probe to indicate that the
special handling is console specific. As long as there is no other
subchannel for which this might be true, it is misleading to speak
of "early devices". Should more of these devices be introduced,
a cleanup of all console special handling is in order anyway.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Peter Oberparleiter 2009-10-14 12:43:50 +02:00 committed by Martin Schwidefsky
parent d3acf71fb8
commit 6d7c5afc89
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/s390/cio/device.c
View File

@ -1250,8 +1250,7 @@ static int io_subchannel_probe(struct subchannel *sch)
unsigned long flags; unsigned long flags;
struct ccw_dev_id dev_id; struct ccw_dev_id dev_id;
cdev = sch_get_cdev(sch); if (cio_is_console(sch->schid)) {
if (cdev) {
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)
@ -1260,13 +1259,13 @@ static int io_subchannel_probe(struct subchannel *sch)
"0.%x.%04x (rc=%d)\n", "0.%x.%04x (rc=%d)\n",
sch->schid.ssid, sch->schid.sch_no, rc); sch->schid.ssid, sch->schid.sch_no, rc);
/* /*
* This subchannel already has an associated ccw_device. * The console subchannel already has an associated ccw_device.
* Throw the delayed uevent for the subchannel, register * Throw the delayed uevent for the subchannel, register
* the ccw_device and exit. This happens for all early * the ccw_device and exit.
* devices, e.g. the console.
*/ */
dev_set_uevent_suppress(&sch->dev, 0); dev_set_uevent_suppress(&sch->dev, 0);
kobject_uevent(&sch->dev.kobj, KOBJ_ADD); kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
cdev = sch_get_cdev(sch);
cdev->dev.groups = ccwdev_attr_groups; cdev->dev.groups = ccwdev_attr_groups;
device_initialize(&cdev->dev); device_initialize(&cdev->dev);
ccw_device_register(cdev); ccw_device_register(cdev);