summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2007-01-28 00:53:31 +0100
committerAdrian Bunk <bunk@stusta.de>2007-01-30 21:22:58 +0100
commite43c51964140ae3b11b320fae451f47ecb7763d4 (patch)
tree770a4e721ad4612e126d82127755771a7bce5a77
parent144d09c6b0f3638ba03f9994a01aa0136b86918c (diff)
[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. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
-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 0459f4194d7c..c96f7140cb62 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");
}