[SCSI] areca sysfs fix
authorAndrew Morton <akpm@osdl.org>
Sat, 29 Jul 2006 18:14:08 +0000 (11:14 -0700)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Wed, 2 Aug 2006 14:51:23 +0000 (10:51 -0400)
Remove sysfs_remove_bin_file() return-value checking from the areca driver.

There's nothing a driver can do if sysfs file removal fails, so we'll soon be
changing sysfs_remove_bin_file() to internally print a diagnostic and to
return void.

Cc: Erich Chen <erich@areca.com.tw>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/arcmsr/arcmsr_attr.c

index 0459f41..c96f714 100644 (file)
@@ -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,20 +252,13 @@ 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");
 }