diff options
Diffstat (limited to 'drivers/pci/hotplug/rpadlpar_core.c')
-rw-r--r-- | drivers/pci/hotplug/rpadlpar_core.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c index 191954bc8e5b..9c2a22fed18b 100644 --- a/drivers/pci/hotplug/rpadlpar_core.c +++ b/drivers/pci/hotplug/rpadlpar_core.c | |||
@@ -147,7 +147,7 @@ static void dlpar_pci_add_bus(struct device_node *dn) | |||
147 | dev = of_create_pci_dev(dn, phb->bus, pdn->devfn); | 147 | dev = of_create_pci_dev(dn, phb->bus, pdn->devfn); |
148 | if (!dev) { | 148 | if (!dev) { |
149 | printk(KERN_ERR "%s: failed to create pci dev for %s\n", | 149 | printk(KERN_ERR "%s: failed to create pci dev for %s\n", |
150 | __FUNCTION__, dn->full_name); | 150 | __func__, dn->full_name); |
151 | return; | 151 | return; |
152 | } | 152 | } |
153 | 153 | ||
@@ -183,21 +183,21 @@ static int dlpar_add_pci_slot(char *drc_name, struct device_node *dn) | |||
183 | dev = dlpar_find_new_dev(phb->bus, dn); | 183 | dev = dlpar_find_new_dev(phb->bus, dn); |
184 | 184 | ||
185 | if (!dev) { | 185 | if (!dev) { |
186 | printk(KERN_ERR "%s: unable to add bus %s\n", __FUNCTION__, | 186 | printk(KERN_ERR "%s: unable to add bus %s\n", __func__, |
187 | drc_name); | 187 | drc_name); |
188 | return -EIO; | 188 | return -EIO; |
189 | } | 189 | } |
190 | 190 | ||
191 | if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { | 191 | if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { |
192 | printk(KERN_ERR "%s: unexpected header type %d, unable to add bus %s\n", | 192 | printk(KERN_ERR "%s: unexpected header type %d, unable to add bus %s\n", |
193 | __FUNCTION__, dev->hdr_type, drc_name); | 193 | __func__, dev->hdr_type, drc_name); |
194 | return -EIO; | 194 | return -EIO; |
195 | } | 195 | } |
196 | 196 | ||
197 | /* Add hotplug slot */ | 197 | /* Add hotplug slot */ |
198 | if (rpaphp_add_slot(dn)) { | 198 | if (rpaphp_add_slot(dn)) { |
199 | printk(KERN_ERR "%s: unable to add hotplug slot %s\n", | 199 | printk(KERN_ERR "%s: unable to add hotplug slot %s\n", |
200 | __FUNCTION__, drc_name); | 200 | __func__, drc_name); |
201 | return -EIO; | 201 | return -EIO; |
202 | } | 202 | } |
203 | return 0; | 203 | return 0; |
@@ -239,7 +239,7 @@ static int dlpar_remove_phb(char *drc_name, struct device_node *dn) | |||
239 | if (rpaphp_deregister_slot(slot)) { | 239 | if (rpaphp_deregister_slot(slot)) { |
240 | printk(KERN_ERR | 240 | printk(KERN_ERR |
241 | "%s: unable to remove hotplug slot %s\n", | 241 | "%s: unable to remove hotplug slot %s\n", |
242 | __FUNCTION__, drc_name); | 242 | __func__, drc_name); |
243 | return -EIO; | 243 | return -EIO; |
244 | } | 244 | } |
245 | } | 245 | } |
@@ -270,7 +270,7 @@ static int dlpar_add_phb(char *drc_name, struct device_node *dn) | |||
270 | 270 | ||
271 | if (rpaphp_add_slot(dn)) { | 271 | if (rpaphp_add_slot(dn)) { |
272 | printk(KERN_ERR "%s: unable to add hotplug slot %s\n", | 272 | printk(KERN_ERR "%s: unable to add hotplug slot %s\n", |
273 | __FUNCTION__, drc_name); | 273 | __func__, drc_name); |
274 | return -EIO; | 274 | return -EIO; |
275 | } | 275 | } |
276 | return 0; | 276 | return 0; |
@@ -284,7 +284,7 @@ static int dlpar_add_vio_slot(char *drc_name, struct device_node *dn) | |||
284 | if (!vio_register_device_node(dn)) { | 284 | if (!vio_register_device_node(dn)) { |
285 | printk(KERN_ERR | 285 | printk(KERN_ERR |
286 | "%s: failed to register vio node %s\n", | 286 | "%s: failed to register vio node %s\n", |
287 | __FUNCTION__, drc_name); | 287 | __func__, drc_name); |
288 | return -EIO; | 288 | return -EIO; |
289 | } | 289 | } |
290 | return 0; | 290 | return 0; |
@@ -384,7 +384,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn) | |||
384 | if (rpaphp_deregister_slot(slot)) { | 384 | if (rpaphp_deregister_slot(slot)) { |
385 | printk(KERN_ERR | 385 | printk(KERN_ERR |
386 | "%s: unable to remove hotplug slot %s\n", | 386 | "%s: unable to remove hotplug slot %s\n", |
387 | __FUNCTION__, drc_name); | 387 | __func__, drc_name); |
388 | return -EIO; | 388 | return -EIO; |
389 | } | 389 | } |
390 | } else | 390 | } else |
@@ -392,7 +392,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn) | |||
392 | 392 | ||
393 | if (pcibios_unmap_io_space(bus)) { | 393 | if (pcibios_unmap_io_space(bus)) { |
394 | printk(KERN_ERR "%s: failed to unmap bus range\n", | 394 | printk(KERN_ERR "%s: failed to unmap bus range\n", |
395 | __FUNCTION__); | 395 | __func__); |
396 | return -ERANGE; | 396 | return -ERANGE; |
397 | } | 397 | } |
398 | 398 | ||
@@ -458,7 +458,7 @@ int __init rpadlpar_io_init(void) | |||
458 | 458 | ||
459 | if (!is_dlpar_capable()) { | 459 | if (!is_dlpar_capable()) { |
460 | printk(KERN_WARNING "%s: partition not DLPAR capable\n", | 460 | printk(KERN_WARNING "%s: partition not DLPAR capable\n", |
461 | __FUNCTION__); | 461 | __func__); |
462 | return -EPERM; | 462 | return -EPERM; |
463 | } | 463 | } |
464 | 464 | ||