summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-07-29 11:14:08 -0700
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-08-02 10:51:23 -0400
commit43d6b68dc38867e489995e21649bb82f6ee7b5d3 (patch)
treee4523050e774a13d436dcdfad4c00b28ceff4bd9 /drivers/scsi
parent1c57e86d75cf162bdadb3a5fe0cd3f65aa1a9ca3 (diff)
downloadop-kernel-dev-43d6b68dc38867e489995e21649bb82f6ee7b5d3.zip
op-kernel-dev-43d6b68dc38867e489995e21649bb82f6ee7b5d3.tar.gz
[SCSI] areca sysfs fix
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/arcmsr/arcmsr_attr.c21
1 files changed, 5 insertions, 16 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 0459f41..c96f714 100644
--- 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,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");
}
OpenPOWER on IntegriCloud