[SCSI] scsi_error.c: Add EH Start Unit retry

[safe/jmp/linux-2.6] / drivers / scsi / arcmsr / arcmsr_attr.c

diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 0459f41..12497da 100644 (file)
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -240,15 +240,11 @@ int arcmsr_alloc_sysfs_attr(struct AdapterControlBlock *acb)
        }
        return 0;
 error_bin_file_message_clear:
-       error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+       sysfs_remove_bin_file(&host->shost_classdev.kobj,
                                &arcmsr_sysfs_message_write_attr);
-       if (error)
-               printk(KERN_ERR "arcmsr: sysfs_remove_bin_file mu_write failed\n");
 error_bin_file_message_write:
-       error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+       sysfs_remove_bin_file(&host->shost_classdev.kobj,
                                &arcmsr_sysfs_message_read_attr);
-       if (error)
-               printk(KERN_ERR "arcmsr: sysfs_remove_bin_file mu_read failed\n");
 error_bin_file_message_read:
        return error;
 }
@@ -256,27 +252,20 @@ error_bin_file_message_read:
 void
 arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb) {
        struct Scsi_Host *host = acb->host;
-       int error;
 
-       error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+       sysfs_remove_bin_file(&host->shost_classdev.kobj,
                                &arcmsr_sysfs_message_clear_attr);
-       if (error)
-               printk(KERN_ERR "arcmsr: free sysfs mu_clear failed\n");
-       error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+       sysfs_remove_bin_file(&host->shost_classdev.kobj,
                                &arcmsr_sysfs_message_write_attr);
-       if (error)
-               printk(KERN_ERR "arcmsr: free sysfs mu_write failed\n");
-       error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
+       sysfs_remove_bin_file(&host->shost_classdev.kobj,
                                &arcmsr_sysfs_message_read_attr);
-       if (error)
-               printk(KERN_ERR "arcmsr: free sysfss mu_read failed\n");
 }
 
 
 static ssize_t
 arcmsr_attr_host_driver_version(struct class_device *cdev, char *buf) {
        return snprintf(buf, PAGE_SIZE,
-                       "ARCMSR: %s\n",
+                       "%s\n",
                        ARCMSR_DRIVER_VERSION);
 }
 
@@ -285,7 +274,7 @@ arcmsr_attr_host_driver_posted_cmd(struct class_device *cdev, char *buf) {
        struct Scsi_Host *host = class_to_shost(cdev);
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
        return snprintf(buf, PAGE_SIZE,
-                       "Current commands posted:     %4d\n",
+                       "%4d\n",
                        atomic_read(&acb->ccboutstandingcount));
 }
 
@@ -294,7 +283,7 @@ arcmsr_attr_host_driver_reset(struct class_device *cdev, char *buf) {
        struct Scsi_Host *host = class_to_shost(cdev);
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
        return snprintf(buf, PAGE_SIZE,
-                       "SCSI Host Resets:            %4d\n",
+                       "%4d\n",
                        acb->num_resets);
 }
 
@@ -303,7 +292,7 @@ arcmsr_attr_host_driver_abort(struct class_device *cdev, char *buf) {
        struct Scsi_Host *host = class_to_shost(cdev);
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
        return snprintf(buf, PAGE_SIZE,
-                       "SCSI Aborts/Timeouts:        %4d\n",
+                       "%4d\n",
                        acb->num_aborts);
 }
 
@@ -312,7 +301,7 @@ arcmsr_attr_host_fw_model(struct class_device *cdev, char *buf) {
     struct Scsi_Host *host = class_to_shost(cdev);
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
        return snprintf(buf, PAGE_SIZE,
-                       "Adapter Model: %s\n",
+                       "%s\n",
                        acb->firm_model);
 }
 
@@ -322,7 +311,7 @@ arcmsr_attr_host_fw_version(struct class_device *cdev, char *buf) {
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
 
        return snprintf(buf, PAGE_SIZE,
-                       "Firmware Version:  %s\n",
+                       "%s\n",
                        acb->firm_version);
 }
 
@@ -332,7 +321,7 @@ arcmsr_attr_host_fw_request_len(struct class_device *cdev, char *buf) {
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
 
        return snprintf(buf, PAGE_SIZE,
-                       "Reguest Lenth: %4d\n",
+                       "%4d\n",
                        acb->firm_request_len);
 }
 
@@ -342,7 +331,7 @@ arcmsr_attr_host_fw_numbers_queue(struct class_device *cdev, char *buf) {
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
 
        return snprintf(buf, PAGE_SIZE,
-                       "Numbers of Queue: %4d\n",
+                       "%4d\n",
                        acb->firm_numbers_queue);
 }
 
@@ -352,7 +341,7 @@ arcmsr_attr_host_fw_sdram_size(struct class_device *cdev, char *buf) {
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
 
        return snprintf(buf, PAGE_SIZE,
-                       "SDRAM Size: %4d\n",
+                       "%4d\n",
                        acb->firm_sdram_size);
 }
 
@@ -362,7 +351,7 @@ arcmsr_attr_host_fw_hd_channels(struct class_device *cdev, char *buf) {
        struct AdapterControlBlock *acb = (struct AdapterControlBlock *) host->hostdata;
 
        return snprintf(buf, PAGE_SIZE,
-                       "Hard Disk Channels: %4d\n",
+                       "%4d\n",
                        acb->firm_hd_channels);
 }