diff options
Diffstat (limited to 'drivers/pci/hotplug/rpaphp_slot.c')
-rw-r--r-- | drivers/pci/hotplug/rpaphp_slot.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c index b283bbea6d24..a6082cc263f7 100644 --- a/drivers/pci/hotplug/rpaphp_slot.c +++ b/drivers/pci/hotplug/rpaphp_slot.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * RPA Virtual I/O device functions | 2 | * RPA Virtual I/O device functions |
3 | * Copyright (C) 2004 Linda Xie <lxie@us.ibm.com> | 3 | * Copyright (C) 2004 Linda Xie <lxie@us.ibm.com> |
4 | * | 4 | * |
5 | * All rights reserved. | 5 | * All rights reserved. |
@@ -51,27 +51,27 @@ struct slot *alloc_slot_struct(struct device_node *dn, | |||
51 | int drc_index, char *drc_name, int power_domain) | 51 | int drc_index, char *drc_name, int power_domain) |
52 | { | 52 | { |
53 | struct slot *slot; | 53 | struct slot *slot; |
54 | 54 | ||
55 | slot = kzalloc(sizeof(struct slot), GFP_KERNEL); | 55 | slot = kzalloc(sizeof(struct slot), GFP_KERNEL); |
56 | if (!slot) | 56 | if (!slot) |
57 | goto error_nomem; | 57 | goto error_nomem; |
58 | slot->hotplug_slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL); | 58 | slot->hotplug_slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL); |
59 | if (!slot->hotplug_slot) | 59 | if (!slot->hotplug_slot) |
60 | goto error_slot; | 60 | goto error_slot; |
61 | slot->hotplug_slot->info = kzalloc(sizeof(struct hotplug_slot_info), | 61 | slot->hotplug_slot->info = kzalloc(sizeof(struct hotplug_slot_info), |
62 | GFP_KERNEL); | 62 | GFP_KERNEL); |
63 | if (!slot->hotplug_slot->info) | 63 | if (!slot->hotplug_slot->info) |
64 | goto error_hpslot; | 64 | goto error_hpslot; |
65 | slot->name = kstrdup(drc_name, GFP_KERNEL); | 65 | slot->name = kstrdup(drc_name, GFP_KERNEL); |
66 | if (!slot->name) | 66 | if (!slot->name) |
67 | goto error_info; | 67 | goto error_info; |
68 | slot->dn = dn; | 68 | slot->dn = dn; |
69 | slot->index = drc_index; | 69 | slot->index = drc_index; |
70 | slot->power_domain = power_domain; | 70 | slot->power_domain = power_domain; |
71 | slot->hotplug_slot->private = slot; | 71 | slot->hotplug_slot->private = slot; |
72 | slot->hotplug_slot->ops = &rpaphp_hotplug_slot_ops; | 72 | slot->hotplug_slot->ops = &rpaphp_hotplug_slot_ops; |
73 | slot->hotplug_slot->release = &rpaphp_release_slot; | 73 | slot->hotplug_slot->release = &rpaphp_release_slot; |
74 | 74 | ||
75 | return (slot); | 75 | return (slot); |
76 | 76 | ||
77 | error_info: | 77 | error_info: |
@@ -91,7 +91,7 @@ static int is_registered(struct slot *slot) | |||
91 | list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) { | 91 | list_for_each_entry(tmp_slot, &rpaphp_slot_head, rpaphp_slot_list) { |
92 | if (!strcmp(tmp_slot->name, slot->name)) | 92 | if (!strcmp(tmp_slot->name, slot->name)) |
93 | return 1; | 93 | return 1; |
94 | } | 94 | } |
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | 97 | ||
@@ -104,7 +104,7 @@ int rpaphp_deregister_slot(struct slot *slot) | |||
104 | __func__, slot->name); | 104 | __func__, slot->name); |
105 | 105 | ||
106 | list_del(&slot->rpaphp_slot_list); | 106 | list_del(&slot->rpaphp_slot_list); |
107 | 107 | ||
108 | retval = pci_hp_deregister(php_slot); | 108 | retval = pci_hp_deregister(php_slot); |
109 | if (retval) | 109 | if (retval) |
110 | err("Problem unregistering a slot %s\n", slot->name); | 110 | err("Problem unregistering a slot %s\n", slot->name); |
@@ -120,7 +120,7 @@ int rpaphp_register_slot(struct slot *slot) | |||
120 | int retval; | 120 | int retval; |
121 | int slotno; | 121 | int slotno; |
122 | 122 | ||
123 | dbg("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n", | 123 | dbg("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n", |
124 | __func__, slot->dn->full_name, slot->index, slot->name, | 124 | __func__, slot->dn->full_name, slot->index, slot->name, |
125 | slot->power_domain, slot->type); | 125 | slot->power_domain, slot->type); |
126 | 126 | ||
@@ -128,7 +128,7 @@ int rpaphp_register_slot(struct slot *slot) | |||
128 | if (is_registered(slot)) { | 128 | if (is_registered(slot)) { |
129 | err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name); | 129 | err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name); |
130 | return -EAGAIN; | 130 | return -EAGAIN; |
131 | } | 131 | } |
132 | 132 | ||
133 | if (slot->dn->child) | 133 | if (slot->dn->child) |
134 | slotno = PCI_SLOT(PCI_DN(slot->dn->child)->devfn); | 134 | slotno = PCI_SLOT(PCI_DN(slot->dn->child)->devfn); |
@@ -145,4 +145,3 @@ int rpaphp_register_slot(struct slot *slot) | |||
145 | info("Slot [%s] registered\n", slot->name); | 145 | info("Slot [%s] registered\n", slot->name); |
146 | return 0; | 146 | return 0; |
147 | } | 147 | } |
148 | |||