[PATCH -mm] sysfs_remove_bin_file: no return value, no check needed

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>

>   In some cases (eg, sysfs file removal) there's not a lot the caller can do
>   apart from warn, so we should probably change those things to return void
>   and put a diagnostic message into the callee itself.

sysfs_remove_bin_file() cannot tell if there is an error and
cannot return an error, so "fix" around 40 must-check warnings.

Convert sysfs_remove_bin_file() from int to void since it
  cannot return an error.
Remove __must_check from its declaration.
Convert the only function that checked the return value of
  sysfs_remove_bin_file().

Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
---
 drivers/pci/hotplug/acpiphp_ibm.c |    4 +---
 fs/sysfs/bin.c                    |    5 ++---
 include/linux/sysfs.h             |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

--- linux-2618-rc1mm1.orig/fs/sysfs/bin.c
+++ linux-2618-rc1mm1/fs/sysfs/bin.c
@@ -194,10 +194,9 @@ int sysfs_create_bin_file(struct kobject
  *
  */
 
-int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr)
+void sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr)
 {
-	sysfs_hash_and_remove(kobj->dentry,attr->attr.name);
-	return 0;
+	sysfs_hash_and_remove(kobj->dentry, attr->attr.name);
 }
 
 EXPORT_SYMBOL_GPL(sysfs_create_bin_file);
--- linux-2618-rc1mm1.orig/drivers/pci/hotplug/acpiphp_ibm.c
+++ linux-2618-rc1mm1/drivers/pci/hotplug/acpiphp_ibm.c
@@ -487,9 +487,7 @@ static void __exit ibm_acpiphp_exit(void
 	if (ACPI_FAILURE(status))
 		err("%s: Notification handler removal failed\n", __FUNCTION__);
 	/* remove the /sys entries */
-	if (sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr))
-		err("%s: removal of sysfs file apci_table failed\n",
-				__FUNCTION__);
+	sysfs_remove_bin_file(sysdir, &ibm_apci_table_attr);
 }
 
 module_init(ibm_acpiphp_init);
--- linux-2618-rc1mm1.orig/include/linux/sysfs.h
+++ linux-2618-rc1mm1/include/linux/sysfs.h
@@ -116,7 +116,7 @@ sysfs_remove_link(struct kobject *, cons
 
 int __must_check sysfs_create_bin_file(struct kobject * kobj,
 					struct bin_attribute * attr);
-int __must_check sysfs_remove_bin_file(struct kobject * kobj,
+void sysfs_remove_bin_file(struct kobject * kobj,
 					struct bin_attribute * attr);
 
 int __must_check sysfs_create_group(struct kobject *,


---
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/