Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43d6b68d authored by Andrew Morton's avatar Andrew Morton Committed by James Bottomley
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 1c57e86d

drivers/scsi/arcmsr/arcmsr_attr.c

+5 −16
Original line number Diff line number Diff line
@@ -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 @@ int arcmsr_alloc_sysfs_attr(struct AdapterControlBlock *acb) 
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");

}