Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34979
b: refs/heads/master
c: 43d6b68
h: refs/heads/master
i:
  34977: aa96576
  34975: 0501ddf
v: v3
  • Loading branch information
Andrew Morton authored and James Bottomley committed Aug 2, 2006
1 parent cb1de57 commit 3648276
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1c57e86d75cf162bdadb3a5fe0cd3f65aa1a9ca3
refs/heads/master: 43d6b68dc38867e489995e21649bb82f6ee7b5d3
21 changes: 5 additions & 16 deletions trunk/drivers/scsi/arcmsr/arcmsr_attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,36 +240,25 @@ 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;
}

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");
}


Expand Down

0 comments on commit 3648276

Please sign in to comment.