: Janitor PCI rpaphp: compiler warning cleanup
PATCH 1/1 : Janitor PCI rpaphp: compiler warning cleanup
Kirsten,
I sent this yesterday to GregKH under the mistaken impression he was the maintainer. :-) So I'm resending again today.
This is a non-urgent janitorial patch. Please apply.
--linas
This janitorial patch removes the following annoying compile-time message:
drivers/pci/hotplug/rpaphp_slot.c:57: warning: ignoring return value of sfs_create_file declared with attribute warn_unused_result
It also fixes a typo, removes some misc crud.
----
drivers/pci/hotplug/rpaphp_slot.c | 45 +++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 24 deletions(-)
drivers/pci/hotplug/rpaphp_slot.c +21 -24
@@ -47,21 +47,11 @@ static ssize_t location_read_file (strucreturn retval; } -static struct hotplug_slot_attribute hotplug_slot_attr_location = { +static struct hotplug_slot_attribute php_attr_location = { .attr = {.name ="phy_location" , .mode =S_IFREG |S_IRUGO }, .show = location_read_file, }; -static void rpaphp_sysfs_add_attr_location (struct hotplug_slot *slot) -{ -sysfs_create_file (&slot->kobj, &hotplug_slot_attr_location.attr); -} - -static void rpaphp_sysfs_remove_attr_location (struct hotplug_slot *slot) -{ -sysfs_remove_file (&slot->kobj, &hotplug_slot_attr_location.attr); -} -/* free up the memory used by a slot */ static void rpaphp_release_slot (struct hotplug_slot *hotplug_slot) {
@@ -145,7 +135,7 @@ int rpaphp_deregister_slot(struct slot *list_del (&slot->rpaphp_slot_list);/* remove "phy_location" file */ -rpaphp_sysfs_remove_attr_location (php_slot); +sysfs_remove_file (&php_slot->kobj, &php_attr_location.attr); retval =pci_hp_deregister (php_slot);if (retval)
@@ -160,36 +150,43 @@ EXPORT_SYMBOL_GPL(rpaphp_deregister_slotint rpaphp_register_slot (struct slot *slot) { +struct hotplug_slot *php_slot = slot->hotplug_slot;int retval;dbg ("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n" , __FUNCTION__, slot->dn->full_name, slot->index, slot->name, slot->power_domain, slot->type); +/* should not try to register the same slot twice */ -if (is_registered (slot)) {/* should't be here */ +if (is_registered (slot)) {err ("rpaphp_register_slot: slot[%s] is already registered\n" , slot->name); -rpaphp_release_slot (slot->hotplug_slot); -return -EAGAIN ; + retval = -EAGAIN ; + goto register_fail; } - retval =pci_hp_register (slot->hotplug_slot); + + retval =pci_hp_register (php_slot);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); -rpaphp_release_slot (slot->hotplug_slot); -return retval; + goto register_fail; } - -/* create "phy_locatoin" file */ -rpaphp_sysfs_add_attr_location (slot->hotplug_slot); -/* add slot to our internal list */ -dbg ("%s adding slot[%s] to rpaphp_slot_list\n" , - __FUNCTION__, slot->name); +/* create "phy_location" file */ + retval =sysfs_create_file (&php_slot->kobj, &php_attr_location.attr); +if (retval) { +err ("sysfs_create_file failed with error %d\n" , retval); + goto register_fail; + } +/* add slot to our internal list */ list_add (&slot->rpaphp_slot_list, &rpaphp_slot_head);info ("Slot [%s](PCI location=%s) registered\n" , slot->name, slot->location); num_slots++;return 0 ; + +register_fail: +rpaphp_release_slot (php_slot); +return retval; }int rpaphp_get_power_status (struct slot *slot,u8 * value)
Quoted 7 lines · linas
Kirsten,
I sent this yesterday to GregKH under the mistaken impression he was the maintainer. :-) So I'm resending again today.
This is a non-urgent janitorial patch. Please apply.
I can't do anything right the first time.
The patch below superceeds the previous one.
--linas
This janitorial patch removes the following annoying compile-time message:
drivers/pci/hotplug/rpaphp_slot.c:57: warning: ignoring return value of sfs_create_file declared with attribute warn_unused_result
It also fixes a typo, removes some misc crud.
----
drivers/pci/hotplug/rpaphp_slot.c | 47 ++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 24 deletions(-)
drivers/pci/hotplug/rpaphp_slot.c +23 -24
@@ -47,21 +47,11 @@ static ssize_t location_read_file (strucreturn retval; } -static struct hotplug_slot_attribute hotplug_slot_attr_location = { +static struct hotplug_slot_attribute php_attr_location = { .attr = {.name ="phy_location" , .mode =S_IFREG |S_IRUGO }, .show = location_read_file, }; -static void rpaphp_sysfs_add_attr_location (struct hotplug_slot *slot) -{ -sysfs_create_file (&slot->kobj, &hotplug_slot_attr_location.attr); -} - -static void rpaphp_sysfs_remove_attr_location (struct hotplug_slot *slot) -{ -sysfs_remove_file (&slot->kobj, &hotplug_slot_attr_location.attr); -} -/* free up the memory used by a slot */ static void rpaphp_release_slot (struct hotplug_slot *hotplug_slot) {
@@ -145,7 +135,7 @@ int rpaphp_deregister_slot(struct slot *list_del (&slot->rpaphp_slot_list);/* remove "phy_location" file */ -rpaphp_sysfs_remove_attr_location (php_slot); +sysfs_remove_file (&php_slot->kobj, &php_attr_location.attr); retval =pci_hp_deregister (php_slot);if (retval)
@@ -160,36 +150,45 @@ EXPORT_SYMBOL_GPL(rpaphp_deregister_slotint rpaphp_register_slot (struct slot *slot) { +struct hotplug_slot *php_slot = slot->hotplug_slot;int retval;dbg ("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n" , __FUNCTION__, slot->dn->full_name, slot->index, slot->name, slot->power_domain, slot->type); +/* should not try to register the same slot twice */ -if (is_registered (slot)) {/* should't be here */ +if (is_registered (slot)) {err ("rpaphp_register_slot: slot[%s] is already registered\n" , slot->name); -rpaphp_release_slot (slot->hotplug_slot); -return -EAGAIN ; + retval = -EAGAIN ; + goto register_fail; } - retval =pci_hp_register (slot->hotplug_slot); + + retval =pci_hp_register (php_slot);if (retval) {err ("pci_hp_register failed with error %d\n" , retval); -rpaphp_release_slot (slot->hotplug_slot); -return retval; + goto register_fail; } - -/* create "phy_locatoin" file */ -rpaphp_sysfs_add_attr_location (slot->hotplug_slot); -/* add slot to our internal list */ -dbg ("%s adding slot[%s] to rpaphp_slot_list\n" , - __FUNCTION__, slot->name); +/* create "phy_location" file */ + retval =sysfs_create_file (&php_slot->kobj, &php_attr_location.attr); +if (retval) { +err ("sysfs_create_file failed with error %d\n" , retval); + goto sysfs_fail; + } +/* add slot to our internal list */ list_add (&slot->rpaphp_slot_list, &rpaphp_slot_head);info ("Slot [%s](PCI location=%s) registered\n" , slot->name, slot->location); num_slots++;return 0 ; + +sysfs_fail: +pci_hp_deregister (php_slot); +register_fail: +rpaphp_release_slot (php_slot); +return retval; }int rpaphp_get_power_status (struct slot *slot,u8 * value)