diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2006-12-21 20:01:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:50:04 -0500 |
commit | 2410fa4eaec4133f9fa8968f277ddb28b89b92b3 (patch) | |
tree | d005980c5adbab8c612c2bf8c95a362b7375e7b6 /drivers/pci/hotplug/pciehp_core.c | |
parent | a0b1725720d9a023a1dee129234f5972056038c6 (diff) |
pciehp: cleanup slot list
This patch cleans up slot list handling (use list_head). This has no
functional change.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_core.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 051d228e634e..2ddde79e252c 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
@@ -160,8 +160,7 @@ static int init_slots(struct controller *ctrl) | |||
160 | goto error_info; | 160 | goto error_info; |
161 | } | 161 | } |
162 | 162 | ||
163 | slot->next = ctrl->slot; | 163 | list_add(&slot->slot_list, &ctrl->slot_list); |
164 | ctrl->slot = slot; | ||
165 | } | 164 | } |
166 | 165 | ||
167 | return 0; | 166 | return 0; |
@@ -175,22 +174,17 @@ error: | |||
175 | return retval; | 174 | return retval; |
176 | } | 175 | } |
177 | 176 | ||
178 | 177 | static void cleanup_slots(struct controller *ctrl) | |
179 | static int cleanup_slots (struct controller * ctrl) | ||
180 | { | 178 | { |
181 | struct slot *old_slot, *next_slot; | 179 | struct list_head *tmp; |
182 | 180 | struct list_head *next; | |
183 | old_slot = ctrl->slot; | 181 | struct slot *slot; |
184 | ctrl->slot = NULL; | ||
185 | 182 | ||
186 | while (old_slot) { | 183 | list_for_each_safe(tmp, next, &ctrl->slot_list) { |
187 | next_slot = old_slot->next; | 184 | slot = list_entry(tmp, struct slot, slot_list); |
188 | pci_hp_deregister (old_slot->hotplug_slot); | 185 | list_del(&slot->slot_list); |
189 | old_slot = next_slot; | 186 | pci_hp_deregister(slot->hotplug_slot); |
190 | } | 187 | } |
191 | |||
192 | |||
193 | return(0); | ||
194 | } | 188 | } |
195 | 189 | ||
196 | static int get_ctlr_slot_config(struct controller *ctrl) | 190 | static int get_ctlr_slot_config(struct controller *ctrl) |
@@ -368,6 +362,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ | |||
368 | err("%s : out of memory\n", __FUNCTION__); | 362 | err("%s : out of memory\n", __FUNCTION__); |
369 | goto err_out_none; | 363 | goto err_out_none; |
370 | } | 364 | } |
365 | INIT_LIST_HEAD(&ctrl->slot_list); | ||
371 | 366 | ||
372 | pdev = dev->port; | 367 | pdev = dev->port; |
373 | ctrl->pci_dev = pdev; | 368 | ctrl->pci_dev = pdev; |