diff options
| author | Michael Ernst | 2008-07-14 09:59:22 +0200 |
|---|---|---|
| committer | Heiko Carstens | 2008-07-14 10:02:18 +0200 |
| commit | c78aa6cbace460081ddc6227f02b6d3203a21585 (patch) | |
| tree | ca4847b11a5a80e9e6794c46338a7df2bafba909 /drivers/s390/cio/device.c | |
| parent | [S390] Move memory detection code to own file. (diff) | |
| download | kernel-qcow2-linux-c78aa6cbace460081ddc6227f02b6d3203a21585.tar.gz kernel-qcow2-linux-c78aa6cbace460081ddc6227f02b6d3203a21585.tar.xz kernel-qcow2-linux-c78aa6cbace460081ddc6227f02b6d3203a21585.zip | |
[S390] Cleanup cio printk messages.
Unnecessary dev_info, dev_warn and printk messages are removed.
Signed-off-by: Michael Ernst <mernst@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/device.c')
| -rw-r--r-- | drivers/s390/cio/device.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index c904cb84d75e..e818d0c54c09 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -493,25 +493,22 @@ static int online_store_recog_and_online(struct ccw_device *cdev) ccw_device_set_online(cdev); return 0; } -static void online_store_handle_online(struct ccw_device *cdev, int force) +static int online_store_handle_online(struct ccw_device *cdev, int force) { int ret; ret = online_store_recog_and_online(cdev); if (ret) - return; + return ret; if (force && cdev->private->state == DEV_STATE_BOXED) { ret = ccw_device_stlck(cdev); - if (ret) { - dev_warn(&cdev->dev, - "ccw_device_stlck returned %d!\n", ret); - return; - } + if (ret) + return ret; if (cdev->id.cu_type == 0) cdev->private->state = DEV_STATE_NOT_OPER; online_store_recog_and_online(cdev); } - + return 0; } static ssize_t online_store (struct device *dev, struct device_attribute *attr, @@ -544,8 +541,9 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr, ret = count; break; case 1: - online_store_handle_online(cdev, force); - ret = count; + ret = online_store_handle_online(cdev, force); + if (!ret) + ret = count; break; default: ret = -EINVAL; |