aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device.c
diff options
context:
space:
mode:
authorMichael Ernst <mernst@de.ibm.com>2008-07-14 03:59:22 -0400
committerHeiko Carstens <heiko.carstens@de.ibm.com>2008-07-14 04:02:18 -0400
commitc78aa6cbace460081ddc6227f02b6d3203a21585 (patch)
treeca4847b11a5a80e9e6794c46338a7df2bafba909 /drivers/s390/cio/device.c
parent23d1742179170b69e61ac9166248ffd64857e55a (diff)
[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.c18
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)
493 ccw_device_set_online(cdev); 493 ccw_device_set_online(cdev);
494 return 0; 494 return 0;
495} 495}
496static void online_store_handle_online(struct ccw_device *cdev, int force) 496static int online_store_handle_online(struct ccw_device *cdev, int force)
497{ 497{
498 int ret; 498 int ret;
499 499
500 ret = online_store_recog_and_online(cdev); 500 ret = online_store_recog_and_online(cdev);
501 if (ret) 501 if (ret)
502 return; 502 return ret;
503 if (force && cdev->private->state == DEV_STATE_BOXED) { 503 if (force && cdev->private->state == DEV_STATE_BOXED) {
504 ret = ccw_device_stlck(cdev); 504 ret = ccw_device_stlck(cdev);
505 if (ret) { 505 if (ret)
506 dev_warn(&cdev->dev, 506 return ret;
507 "ccw_device_stlck returned %d!\n", ret);
508 return;
509 }
510 if (cdev->id.cu_type == 0) 507 if (cdev->id.cu_type == 0)
511 cdev->private->state = DEV_STATE_NOT_OPER; 508 cdev->private->state = DEV_STATE_NOT_OPER;
512 online_store_recog_and_online(cdev); 509 online_store_recog_and_online(cdev);
513 } 510 }
514 511 return 0;
515} 512}
516 513
517static ssize_t online_store (struct device *dev, struct device_attribute *attr, 514static 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,
544 ret = count; 541 ret = count;
545 break; 542 break;
546 case 1: 543 case 1:
547 online_store_handle_online(cdev, force); 544 ret = online_store_handle_online(cdev, force);
548 ret = count; 545 if (!ret)
546 ret = count;
549 break; 547 break;
550 default: 548 default:
551 ret = -EINVAL; 549 ret = -EINVAL;