diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 22:09:46 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-21 00:47:09 -0400 |
commit | 66bef8c059015ba2b36bb5759080336feb01e680 (patch) | |
tree | 9060b134ba07e052bf40e0fbe641dfaa86bcbd9d /drivers/pci/pcie | |
parent | ca99eb8c2d56bdfff0161388b81e641f4e039b3f (diff) |
PCI: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pcie')
-rw-r--r-- | drivers/pci/pcie/aer/aerdrv.c | 4 | ||||
-rw-r--r-- | drivers/pci/pcie/aer/aerdrv_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/pcie/portdrv_core.c | 4 | ||||
-rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c index 7a62f7dd9009..07c3bdb6edc2 100644 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c | |||
@@ -220,7 +220,7 @@ static int __devinit aer_probe (struct pcie_device *dev, | |||
220 | /* Alloc rpc data structure */ | 220 | /* Alloc rpc data structure */ |
221 | if (!(rpc = aer_alloc_rpc(dev))) { | 221 | if (!(rpc = aer_alloc_rpc(dev))) { |
222 | printk(KERN_DEBUG "%s: Alloc rpc fails on PCIE device[%s]\n", | 222 | printk(KERN_DEBUG "%s: Alloc rpc fails on PCIE device[%s]\n", |
223 | __FUNCTION__, device->bus_id); | 223 | __func__, device->bus_id); |
224 | aer_remove(dev); | 224 | aer_remove(dev); |
225 | return -ENOMEM; | 225 | return -ENOMEM; |
226 | } | 226 | } |
@@ -229,7 +229,7 @@ static int __devinit aer_probe (struct pcie_device *dev, | |||
229 | if ((status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", | 229 | if ((status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", |
230 | dev))) { | 230 | dev))) { |
231 | printk(KERN_DEBUG "%s: Request ISR fails on PCIE device[%s]\n", | 231 | printk(KERN_DEBUG "%s: Request ISR fails on PCIE device[%s]\n", |
232 | __FUNCTION__, device->bus_id); | 232 | __func__, device->bus_id); |
233 | aer_remove(dev); | 233 | aer_remove(dev); |
234 | return status; | 234 | return status; |
235 | } | 235 | } |
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index e84dfc8be0e9..aaa82392d1dc 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c | |||
@@ -691,7 +691,7 @@ static void aer_isr_one_error(struct pcie_device *p_device, | |||
691 | e_info.flags |= AER_MULTI_ERROR_VALID_FLAG; | 691 | e_info.flags |= AER_MULTI_ERROR_VALID_FLAG; |
692 | if (!(s_device = find_source_device(p_device->port, id))) { | 692 | if (!(s_device = find_source_device(p_device->port, id))) { |
693 | printk(KERN_DEBUG "%s->can't find device of ID%04x\n", | 693 | printk(KERN_DEBUG "%s->can't find device of ID%04x\n", |
694 | __FUNCTION__, id); | 694 | __func__, id); |
695 | continue; | 695 | continue; |
696 | } | 696 | } |
697 | if (get_device_error_info(to_pci_dev(s_device), &e_info) == | 697 | if (get_device_error_info(to_pci_dev(s_device), &e_info) == |
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index 23d9eb073296..fb0abfa508dc 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c | |||
@@ -150,7 +150,7 @@ static int assign_interrupt_mode(struct pci_dev *dev, int *vectors, int mask) | |||
150 | if (pos) { | 150 | if (pos) { |
151 | struct msix_entry msix_entries[PCIE_PORT_DEVICE_MAXSERVICES] = | 151 | struct msix_entry msix_entries[PCIE_PORT_DEVICE_MAXSERVICES] = |
152 | {{0, 0}, {0, 1}, {0, 2}, {0, 3}}; | 152 | {{0, 0}, {0, 1}, {0, 2}, {0, 3}}; |
153 | printk("%s Found MSIX capability\n", __FUNCTION__); | 153 | printk("%s Found MSIX capability\n", __func__); |
154 | status = pci_enable_msix(dev, msix_entries, nvec); | 154 | status = pci_enable_msix(dev, msix_entries, nvec); |
155 | if (!status) { | 155 | if (!status) { |
156 | int j = 0; | 156 | int j = 0; |
@@ -165,7 +165,7 @@ static int assign_interrupt_mode(struct pci_dev *dev, int *vectors, int mask) | |||
165 | if (status) { | 165 | if (status) { |
166 | pos = pci_find_capability(dev, PCI_CAP_ID_MSI); | 166 | pos = pci_find_capability(dev, PCI_CAP_ID_MSI); |
167 | if (pos) { | 167 | if (pos) { |
168 | printk("%s Found MSI capability\n", __FUNCTION__); | 168 | printk("%s Found MSI capability\n", __func__); |
169 | status = pci_enable_msi(dev); | 169 | status = pci_enable_msi(dev); |
170 | if (!status) { | 170 | if (!status) { |
171 | interrupt_mode = PCIE_PORT_MSI_MODE; | 171 | interrupt_mode = PCIE_PORT_MSI_MODE; |
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 26057f98f72e..51d163238d93 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
@@ -93,7 +93,7 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev, | |||
93 | if (!dev->irq && dev->pin) { | 93 | if (!dev->irq && dev->pin) { |
94 | printk(KERN_WARNING | 94 | printk(KERN_WARNING |
95 | "%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", | 95 | "%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", |
96 | __FUNCTION__, dev->vendor, dev->device); | 96 | __func__, dev->vendor, dev->device); |
97 | } | 97 | } |
98 | if (pcie_port_device_register(dev)) { | 98 | if (pcie_port_device_register(dev)) { |
99 | pci_disable_device(dev); | 99 | pci_disable_device(dev); |