* [PATCH]: Janitor PCI rpaphp: compiler warning cleanup
@ 2006-11-15 20:00 Linas Vepstas
2006-11-15 20:11 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Linas Vepstas @ 2006-11-15 20:00 UTC (permalink / raw)
To: Greg KH; +Cc: linuxppc-dev, linux-pci, johnrose
Greg,
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.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@us.ibm.com>
----
drivers/pci/hotplug/rpaphp_slot.c | 45 +++++++++++++++++---------------------
1 file changed, 21 insertions(+), 24 deletions(-)
Index: linux-2.6.19-rc4-git3/drivers/pci/hotplug/rpaphp_slot.c
===================================================================
--- linux-2.6.19-rc4-git3.orig/drivers/pci/hotplug/rpaphp_slot.c 2006-09-19 22:42:06.000000000 -0500
+++ linux-2.6.19-rc4-git3/drivers/pci/hotplug/rpaphp_slot.c 2006-11-15 13:43:54.000000000 -0600
@@ -47,21 +47,11 @@ static ssize_t location_read_file (struc
return 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_slot
int 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)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]: Janitor PCI rpaphp: compiler warning cleanup
2006-11-15 20:00 Linas Vepstas
@ 2006-11-15 20:11 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2006-11-15 20:11 UTC (permalink / raw)
To: Linas Vepstas; +Cc: linuxppc-dev, linux-pci, johnrose
On Wed, Nov 15, 2006 at 02:00:37PM -0600, Linas Vepstas wrote:
>
> Greg,
> Non-urgent janitorial patch. Please apply.
Please note that I am no longer the PCI Hotplug maintainer, these
patches should go through Kristen instead.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH]: Janitor PCI rpaphp: compiler warning cleanup
@ 2006-11-16 21:13 Linas Vepstas
2006-11-17 1:01 ` Linas Vepstas
0 siblings, 1 reply; 4+ messages in thread
From: Linas Vepstas @ 2006-11-16 21:13 UTC (permalink / raw)
To: Kristen Carlson Accardi
Cc: linuxppc-dev, linux-pci, pcihpd-discuss, johnrose, Greg KH
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.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@us.ibm.com>
----
drivers/pci/hotplug/rpaphp_slot.c | 45 +++++++++++++++++---------------------
1 file changed, 21 insertions(+), 24 deletions(-)
Index: linux-2.6.19-rc4-git3/drivers/pci/hotplug/rpaphp_slot.c
===================================================================
--- linux-2.6.19-rc4-git3.orig/drivers/pci/hotplug/rpaphp_slot.c 2006-09-19 22:42:06.000000000 -0500
+++ linux-2.6.19-rc4-git3/drivers/pci/hotplug/rpaphp_slot.c 2006-11-15 13:44:08.000000000 -0600
@@ -47,21 +47,11 @@ static ssize_t location_read_file (struc
return 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_slot
int 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)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]: Janitor PCI rpaphp: compiler warning cleanup
2006-11-16 21:13 [PATCH]: Janitor PCI rpaphp: compiler warning cleanup Linas Vepstas
@ 2006-11-17 1:01 ` Linas Vepstas
0 siblings, 0 replies; 4+ messages in thread
From: Linas Vepstas @ 2006-11-17 1:01 UTC (permalink / raw)
To: Kristen Carlson Accardi
Cc: linuxppc-dev, linux-pci, pcihpd-discuss, johnrose, Greg KH
On Thu, Nov 16, 2006 at 03:13:29PM -0600, linas wrote:
>
> 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.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@us.ibm.com>
----
drivers/pci/hotplug/rpaphp_slot.c | 47 ++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 24 deletions(-)
Index: linux-2.6.19-rc4-git3/drivers/pci/hotplug/rpaphp_slot.c
===================================================================
--- linux-2.6.19-rc4-git3.orig/drivers/pci/hotplug/rpaphp_slot.c 2006-11-16 15:21:47.000000000 -0600
+++ linux-2.6.19-rc4-git3/drivers/pci/hotplug/rpaphp_slot.c 2006-11-16 17:48:42.000000000 -0600
@@ -47,21 +47,11 @@ static ssize_t location_read_file (struc
return 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_slot
int 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)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-11-17 1:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-16 21:13 [PATCH]: Janitor PCI rpaphp: compiler warning cleanup Linas Vepstas
2006-11-17 1:01 ` Linas Vepstas
-- strict thread matches above, loose matches on Subject: below --
2006-11-15 20:00 Linas Vepstas
2006-11-15 20:11 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).