diff options
author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2006-12-21 20:01:02 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 18:50:04 -0500 |
commit | a0b1725720d9a023a1dee129234f5972056038c6 (patch) | |
tree | 9c8d4049e46a968547750ad0f1b77f2117ddb2e3 /drivers/pci/hotplug/pciehp.h | |
parent | 429538ad3eeffec4199d8adddd1e9e4c80b2c08b (diff) |
pciehp: cleanup init_slot()
This patch cleans up init_slots() in pciehp_core.c based on
pcihp_skeleton.c. 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.h')
-rw-r--r-- | drivers/pci/hotplug/pciehp.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 4fb12fcda563..6a2f427768ca 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
@@ -50,7 +50,7 @@ extern int pciehp_force; | |||
50 | #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) | 50 | #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg) |
51 | #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) | 51 | #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg) |
52 | 52 | ||
53 | 53 | #define SLOT_NAME_SIZE 10 | |
54 | struct slot { | 54 | struct slot { |
55 | struct slot *next; | 55 | struct slot *next; |
56 | u8 bus; | 56 | u8 bus; |
@@ -63,6 +63,7 @@ struct slot { | |||
63 | struct hpc_ops *hpc_ops; | 63 | struct hpc_ops *hpc_ops; |
64 | struct hotplug_slot *hotplug_slot; | 64 | struct hotplug_slot *hotplug_slot; |
65 | struct list_head slot_list; | 65 | struct list_head slot_list; |
66 | char name[SLOT_NAME_SIZE]; | ||
66 | }; | 67 | }; |
67 | 68 | ||
68 | struct event_info { | 69 | struct event_info { |
@@ -233,13 +234,6 @@ static inline int wait_for_ctrl_irq(struct controller *ctrl) | |||
233 | return retval; | 234 | return retval; |
234 | } | 235 | } |
235 | 236 | ||
236 | #define SLOT_NAME_SIZE 10 | ||
237 | |||
238 | static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot) | ||
239 | { | ||
240 | snprintf(buffer, buffer_size, "%04d_%04d", slot->bus, slot->number); | ||
241 | } | ||
242 | |||
243 | enum php_ctlr_type { | 237 | enum php_ctlr_type { |
244 | PCI, | 238 | PCI, |
245 | ISA, | 239 | ISA, |