aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r--drivers/pci/hotplug/rpaphp.h1
-rw-r--r--drivers/pci/hotplug/rpaphp_core.c4
-rw-r--r--drivers/pci/hotplug/rpaphp_slot.c3
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/rpaphp.h b/drivers/pci/hotplug/rpaphp.h
index 2e7accf0f734..2ccbe8d4229d 100644
--- a/drivers/pci/hotplug/rpaphp.h
+++ b/drivers/pci/hotplug/rpaphp.h
@@ -83,7 +83,6 @@ struct slot {
83 83
84extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops; 84extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;
85extern struct list_head rpaphp_slot_head; 85extern struct list_head rpaphp_slot_head;
86extern int num_slots;
87 86
88/* function prototypes */ 87/* function prototypes */
89 88
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index f6c05f3621ca..3afd154bf543 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -41,7 +41,6 @@
41int debug; 41int debug;
42static struct semaphore rpaphp_sem; 42static struct semaphore rpaphp_sem;
43LIST_HEAD(rpaphp_slot_head); 43LIST_HEAD(rpaphp_slot_head);
44int num_slots;
45 44
46#define DRIVER_VERSION "0.1" 45#define DRIVER_VERSION "0.1"
47#define DRIVER_AUTHOR "Linda Xie <lxie@us.ibm.com>" 46#define DRIVER_AUTHOR "Linda Xie <lxie@us.ibm.com>"
@@ -325,8 +324,7 @@ int rpaphp_add_slot(struct device_node *dn)
325 name += strlen(name) + 1; 324 name += strlen(name) + 1;
326 type += strlen(type) + 1; 325 type += strlen(type) + 1;
327 } 326 }
328 dbg("%s - Exit: num_slots=%d rc[%d]\n", 327 dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
329 __FUNCTION__, num_slots, retval);
330 return retval; 328 return retval;
331} 329}
332 330
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 3009193f0058..907f1301f84a 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -140,8 +140,6 @@ int rpaphp_deregister_slot(struct slot *slot)
140 retval = pci_hp_deregister(php_slot); 140 retval = pci_hp_deregister(php_slot);
141 if (retval) 141 if (retval)
142 err("Problem unregistering a slot %s\n", slot->name); 142 err("Problem unregistering a slot %s\n", slot->name);
143 else
144 num_slots--;
145 143
146 dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval); 144 dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval);
147 return retval; 145 return retval;
@@ -181,7 +179,6 @@ int rpaphp_register_slot(struct slot *slot)
181 list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head); 179 list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
182 info("Slot [%s](PCI location=%s) registered\n", slot->name, 180 info("Slot [%s](PCI location=%s) registered\n", slot->name,
183 slot->location); 181 slot->location);
184 num_slots++;
185 return 0; 182 return 0;
186 183
187sysfs_fail: 184sysfs_fail: