Commit fa189159 authored by Linas Vepstas's avatar Linas Vepstas Committed by Greg Kroah-Hartman

PCI: rpaphp: Remove global num_slots variable

Cleanup cruft: remove the global "num_slots" variable; 
although scattered across multiple files, it is used only 
once, in a debug statement.
Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: John Rose <johnrose@austin.ibm.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bf8cbae4
...@@ -83,7 +83,6 @@ struct slot { ...@@ -83,7 +83,6 @@ struct slot {
extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops; extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;
extern struct list_head rpaphp_slot_head; extern struct list_head rpaphp_slot_head;
extern int num_slots;
/* function prototypes */ /* function prototypes */
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
int debug; int debug;
static struct semaphore rpaphp_sem; static struct semaphore rpaphp_sem;
LIST_HEAD(rpaphp_slot_head); LIST_HEAD(rpaphp_slot_head);
int num_slots;
#define DRIVER_VERSION "0.1" #define DRIVER_VERSION "0.1"
#define DRIVER_AUTHOR "Linda Xie <lxie@us.ibm.com>" #define DRIVER_AUTHOR "Linda Xie <lxie@us.ibm.com>"
...@@ -325,8 +324,7 @@ int rpaphp_add_slot(struct device_node *dn) ...@@ -325,8 +324,7 @@ int rpaphp_add_slot(struct device_node *dn)
name += strlen(name) + 1; name += strlen(name) + 1;
type += strlen(type) + 1; type += strlen(type) + 1;
} }
dbg("%s - Exit: num_slots=%d rc[%d]\n", dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
__FUNCTION__, num_slots, retval);
return retval; return retval;
} }
......
...@@ -140,8 +140,6 @@ int rpaphp_deregister_slot(struct slot *slot) ...@@ -140,8 +140,6 @@ int rpaphp_deregister_slot(struct slot *slot)
retval = pci_hp_deregister(php_slot); retval = pci_hp_deregister(php_slot);
if (retval) if (retval)
err("Problem unregistering a slot %s\n", slot->name); err("Problem unregistering a slot %s\n", slot->name);
else
num_slots--;
dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval); dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
return retval; return retval;
...@@ -181,7 +179,6 @@ int rpaphp_register_slot(struct slot *slot) ...@@ -181,7 +179,6 @@ int rpaphp_register_slot(struct slot *slot)
list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head); list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
info("Slot [%s](PCI location=%s) registered\n", slot->name, info("Slot [%s](PCI location=%s) registered\n", slot->name,
slot->location); slot->location);
num_slots++;
return 0; return 0;
sysfs_fail: sysfs_fail:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment