diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2006-12-04 15:41:07 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-12-04 15:41:07 +0100 |
| commit | 47af5518526d435d0d56a329a578f240e86eb678 (patch) | |
| tree | 6ec89de2dbb5d2733e82648ecac1779303bd8972 | |
| parent | d23861ff1a4da1f4a5255eb4582f620191c6e1c0 (diff) | |
| download | blackbird-op-linux-47af5518526d435d0d56a329a578f240e86eb678.tar.gz blackbird-op-linux-47af5518526d435d0d56a329a578f240e86eb678.zip | |
[S390] cio: Use device_reprobe() instead of bus_rescan_devices().
In io_subchannel_register(), it is better to just reprobe the current
device if it hasn't a driver yet than to rescan the whole bus.
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/cio/device.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 359b46c25314..d3d3716ff84b 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -687,8 +687,20 @@ io_subchannel_register(void *data) cdev = data; sch = to_subchannel(cdev->dev.parent); + /* + * io_subchannel_register() will also be called after device + * recognition has been done for a boxed device (which will already + * be registered). We need to reprobe since we may now have sense id + * information. + */ if (klist_node_attached(&cdev->dev.knode_parent)) { - bus_rescan_devices(&ccw_bus_type); + if (!cdev->drv) { + ret = device_reprobe(&cdev->dev); + if (ret) + /* We can't do much here. */ + dev_info(&cdev->dev, "device_reprobe() returned" + " %d\n", ret); + } goto out; } /* make it known to the system */ |
