aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-07-29 14:14:08 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-08-02 10:51:23 -0400
commit43d6b68dc38867e489995e21649bb82f6ee7b5d3 (patch)
treee4523050e774a13d436dcdfad4c00b28ceff4bd9
parent1c57e86d75cf162bdadb3a5fe0cd3f65aa1a9ca3 (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. Cc: Erich Chen <erich@areca.com.tw> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-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)
240 } 240 }
241 return 0; 241 return 0;
242error_bin_file_message_clear: 242error_bin_file_message_clear:
243 error = sysfs_remove_bin_file(&host->shost_classdev.kobj, 243 sysfs_remove_bin_file(&host->shost_classdev.kobj,
244 &arcmsr_sysfs_message_write_attr); 244 &arcmsr_sysfs_message_write_attr);
245 if (error)
246 printk(KERN_ERR "arcmsr: sysfs_remove_bin_file mu_write failed\n");
247error_bin_file_message_write: 245error_bin_file_message_write:
248 error = sysfs_remove_bin_file(&host->shost_classdev.kobj, 246 sysfs_remove_bin_file(&host->shost_classdev.kobj,
249 &arcmsr_sysfs_message_read_attr); 247 &arcmsr_sysfs_message_read_attr);
250 if (error)
251 printk(KERN_ERR "arcmsr: sysfs_remove_bin_file mu_read failed\n");
252error_bin_file_message_read: 248error_bin_file_message_read:
253 return error; 249 return error;
254} 250}
@@ -256,20 +252,13 @@ error_bin_file_message_read:
256void 252void
257arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb) { 253arcmsr_free_sysfs_attr(struct AdapterControlBlock *acb) {
258 struct Scsi_Host *host = acb->host; 254 struct Scsi_Host *host = acb->host;
259 int error;
260 255
261 error = sysfs_remove_bin_file(&host->shost_classdev.kobj, 256 sysfs_remove_bin_file(&host->shost_classdev.kobj,
262 &arcmsr_sysfs_message_clear_attr); 257 &arcmsr_sysfs_message_clear_attr);
263 if (error) 258 sysfs_remove_bin_file(&host->shost_classdev.kobj,
264 printk(KERN_ERR "arcmsr: free sysfs mu_clear failed\n");
265 error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
266 &arcmsr_sysfs_message_write_attr); 259 &arcmsr_sysfs_message_write_attr);
267 if (error) 260 sysfs_remove_bin_file(&host->shost_classdev.kobj,
268 printk(KERN_ERR "arcmsr: free sysfs mu_write failed\n");
269 error = sysfs_remove_bin_file(&host->shost_classdev.kobj,
270 &arcmsr_sysfs_message_read_attr); 261 &arcmsr_sysfs_message_read_attr);
271 if (error)
272 printk(KERN_ERR "arcmsr: free sysfss mu_read failed\n");
273} 262}
274 263
275 264