diff options
| author | Hongjie Yang <hongjie@us.ibm.com> | 2008-07-14 03:59:39 -0400 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2008-07-14 04:02:23 -0400 |
| commit | ded77fb4dfcd6f84e564ddd9458208bf5b691c7f (patch) | |
| tree | 705b9b46bea929548dad9d6d13e77f3ecfaebe6d | |
| parent | 2a062ab483f5afd764fb20631ee960672946a4be (diff) | |
[S390] Cleanup dcssblk printk messages.
Signed-off-by: Hongjie Yang <hongjie@us.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
| -rw-r--r-- | drivers/s390/block/dcssblk.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index bb52d2fbac18..01fcdd91b846 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
| @@ -167,10 +167,8 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch | |||
| 167 | struct dcssblk_dev_info *dev_info; | 167 | struct dcssblk_dev_info *dev_info; |
| 168 | int rc; | 168 | int rc; |
| 169 | 169 | ||
| 170 | if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0')) { | 170 | if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0')) |
| 171 | PRINT_WARN("Invalid value, must be 0 or 1\n"); | ||
| 172 | return -EINVAL; | 171 | return -EINVAL; |
| 173 | } | ||
| 174 | down_write(&dcssblk_devices_sem); | 172 | down_write(&dcssblk_devices_sem); |
| 175 | dev_info = container_of(dev, struct dcssblk_dev_info, dev); | 173 | dev_info = container_of(dev, struct dcssblk_dev_info, dev); |
| 176 | if (atomic_read(&dev_info->use_count)) { | 174 | if (atomic_read(&dev_info->use_count)) { |
| @@ -215,7 +213,6 @@ dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch | |||
| 215 | set_disk_ro(dev_info->gd, 0); | 213 | set_disk_ro(dev_info->gd, 0); |
| 216 | } | 214 | } |
| 217 | } else { | 215 | } else { |
| 218 | PRINT_WARN("Invalid value, must be 0 or 1\n"); | ||
| 219 | rc = -EINVAL; | 216 | rc = -EINVAL; |
| 220 | goto out; | 217 | goto out; |
| 221 | } | 218 | } |
| @@ -258,10 +255,8 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char | |||
| 258 | { | 255 | { |
| 259 | struct dcssblk_dev_info *dev_info; | 256 | struct dcssblk_dev_info *dev_info; |
| 260 | 257 | ||
| 261 | if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0')) { | 258 | if ((count > 1) && (inbuf[1] != '\n') && (inbuf[1] != '\0')) |
| 262 | PRINT_WARN("Invalid value, must be 0 or 1\n"); | ||
| 263 | return -EINVAL; | 259 | return -EINVAL; |
| 264 | } | ||
| 265 | dev_info = container_of(dev, struct dcssblk_dev_info, dev); | 260 | dev_info = container_of(dev, struct dcssblk_dev_info, dev); |
| 266 | 261 | ||
| 267 | down_write(&dcssblk_devices_sem); | 262 | down_write(&dcssblk_devices_sem); |
| @@ -289,7 +284,6 @@ dcssblk_save_store(struct device *dev, struct device_attribute *attr, const char | |||
| 289 | } | 284 | } |
| 290 | } else { | 285 | } else { |
| 291 | up_write(&dcssblk_devices_sem); | 286 | up_write(&dcssblk_devices_sem); |
| 292 | PRINT_WARN("Invalid value, must be 0 or 1\n"); | ||
| 293 | return -EINVAL; | 287 | return -EINVAL; |
| 294 | } | 288 | } |
| 295 | up_write(&dcssblk_devices_sem); | 289 | up_write(&dcssblk_devices_sem); |
| @@ -441,7 +435,6 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char | |||
| 441 | goto out; | 435 | goto out; |
| 442 | 436 | ||
| 443 | unregister_dev: | 437 | unregister_dev: |
| 444 | PRINT_ERR("device_create_file() failed!\n"); | ||
| 445 | list_del(&dev_info->lh); | 438 | list_del(&dev_info->lh); |
| 446 | blk_cleanup_queue(dev_info->dcssblk_queue); | 439 | blk_cleanup_queue(dev_info->dcssblk_queue); |
| 447 | dev_info->gd->queue = NULL; | 440 | dev_info->gd->queue = NULL; |
| @@ -702,10 +695,8 @@ dcssblk_check_params(void) | |||
| 702 | static void __exit | 695 | static void __exit |
| 703 | dcssblk_exit(void) | 696 | dcssblk_exit(void) |
| 704 | { | 697 | { |
| 705 | PRINT_DEBUG("DCSSBLOCK EXIT...\n"); | ||
| 706 | s390_root_dev_unregister(dcssblk_root_dev); | 698 | s390_root_dev_unregister(dcssblk_root_dev); |
| 707 | unregister_blkdev(dcssblk_major, DCSSBLK_NAME); | 699 | unregister_blkdev(dcssblk_major, DCSSBLK_NAME); |
| 708 | PRINT_DEBUG("...finished!\n"); | ||
| 709 | } | 700 | } |
| 710 | 701 | ||
| 711 | static int __init | 702 | static int __init |
| @@ -713,27 +704,21 @@ dcssblk_init(void) | |||
| 713 | { | 704 | { |
| 714 | int rc; | 705 | int rc; |
| 715 | 706 | ||
| 716 | PRINT_DEBUG("DCSSBLOCK INIT...\n"); | ||
| 717 | dcssblk_root_dev = s390_root_dev_register("dcssblk"); | 707 | dcssblk_root_dev = s390_root_dev_register("dcssblk"); |
| 718 | if (IS_ERR(dcssblk_root_dev)) { | 708 | if (IS_ERR(dcssblk_root_dev)) |
| 719 | PRINT_ERR("device_register() failed!\n"); | ||
| 720 | return PTR_ERR(dcssblk_root_dev); | 709 | return PTR_ERR(dcssblk_root_dev); |
| 721 | } | ||
| 722 | rc = device_create_file(dcssblk_root_dev, &dev_attr_add); | 710 | rc = device_create_file(dcssblk_root_dev, &dev_attr_add); |
| 723 | if (rc) { | 711 | if (rc) { |
| 724 | PRINT_ERR("device_create_file(add) failed!\n"); | ||
| 725 | s390_root_dev_unregister(dcssblk_root_dev); | 712 | s390_root_dev_unregister(dcssblk_root_dev); |
| 726 | return rc; | 713 | return rc; |
| 727 | } | 714 | } |
| 728 | rc = device_create_file(dcssblk_root_dev, &dev_attr_remove); | 715 | rc = device_create_file(dcssblk_root_dev, &dev_attr_remove); |
| 729 | if (rc) { | 716 | if (rc) { |
| 730 | PRINT_ERR("device_create_file(remove) failed!\n"); | ||
| 731 | s390_root_dev_unregister(dcssblk_root_dev); | 717 | s390_root_dev_unregister(dcssblk_root_dev); |
| 732 | return rc; | 718 | return rc; |
| 733 | } | 719 | } |
| 734 | rc = register_blkdev(0, DCSSBLK_NAME); | 720 | rc = register_blkdev(0, DCSSBLK_NAME); |
| 735 | if (rc < 0) { | 721 | if (rc < 0) { |
| 736 | PRINT_ERR("Can't get dynamic major!\n"); | ||
| 737 | s390_root_dev_unregister(dcssblk_root_dev); | 722 | s390_root_dev_unregister(dcssblk_root_dev); |
| 738 | return rc; | 723 | return rc; |
| 739 | } | 724 | } |
| @@ -742,7 +727,6 @@ dcssblk_init(void) | |||
| 742 | 727 | ||
| 743 | dcssblk_check_params(); | 728 | dcssblk_check_params(); |
| 744 | 729 | ||
| 745 | PRINT_DEBUG("...finished!\n"); | ||
| 746 | return 0; | 730 | return 0; |
| 747 | } | 731 | } |
| 748 | 732 | ||
