diff options
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_pci.c')
-rw-r--r-- | drivers/pci/hotplug/cpqphp_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c index 3f6cd20e95d2..09021930589f 100644 --- a/drivers/pci/hotplug/cpqphp_pci.c +++ b/drivers/pci/hotplug/cpqphp_pci.c | |||
@@ -120,7 +120,7 @@ int cpqhp_unconfigure_device(struct pci_func* func) | |||
120 | { | 120 | { |
121 | int j; | 121 | int j; |
122 | 122 | ||
123 | dbg("%s: bus/dev/func = %x/%x/%x\n", __FUNCTION__, func->bus, func->device, func->function); | 123 | dbg("%s: bus/dev/func = %x/%x/%x\n", __func__, func->bus, func->device, func->function); |
124 | 124 | ||
125 | for (j=0; j<8 ; j++) { | 125 | for (j=0; j<8 ; j++) { |
126 | struct pci_dev* temp = pci_find_slot(func->bus, PCI_DEVFN(func->device, j)); | 126 | struct pci_dev* temp = pci_find_slot(func->bus, PCI_DEVFN(func->device, j)); |
@@ -170,11 +170,11 @@ int cpqhp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) | |||
170 | fakedev->bus = fakebus; | 170 | fakedev->bus = fakebus; |
171 | fakebus->number = bus_num; | 171 | fakebus->number = bus_num; |
172 | dbg("%s: dev %d, bus %d, pin %d, num %d\n", | 172 | dbg("%s: dev %d, bus %d, pin %d, num %d\n", |
173 | __FUNCTION__, dev_num, bus_num, int_pin, irq_num); | 173 | __func__, dev_num, bus_num, int_pin, irq_num); |
174 | rc = pcibios_set_irq_routing(fakedev, int_pin - 0x0a, irq_num); | 174 | rc = pcibios_set_irq_routing(fakedev, int_pin - 0x0a, irq_num); |
175 | kfree(fakedev); | 175 | kfree(fakedev); |
176 | kfree(fakebus); | 176 | kfree(fakebus); |
177 | dbg("%s: rc %d\n", __FUNCTION__, rc); | 177 | dbg("%s: rc %d\n", __func__, rc); |
178 | if (!rc) | 178 | if (!rc) |
179 | return !rc; | 179 | return !rc; |
180 | 180 | ||
@@ -1423,7 +1423,7 @@ int cpqhp_return_board_resources(struct pci_func * func, struct resource_lists * | |||
1423 | int rc = 0; | 1423 | int rc = 0; |
1424 | struct pci_resource *node; | 1424 | struct pci_resource *node; |
1425 | struct pci_resource *t_node; | 1425 | struct pci_resource *t_node; |
1426 | dbg("%s\n", __FUNCTION__); | 1426 | dbg("%s\n", __func__); |
1427 | 1427 | ||
1428 | if (!func) | 1428 | if (!func) |
1429 | return 1; | 1429 | return 1; |