diff options
Diffstat (limited to 'drivers/pci/pcie/aer/aerdrv.c')
-rw-r--r-- | drivers/pci/pcie/aer/aerdrv.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c index 07c3bdb6edc2..77036f46acfe 100644 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/pcieport_if.h> | 26 | #include <linux/pcieport_if.h> |
27 | 27 | ||
28 | #include "aerdrv.h" | 28 | #include "aerdrv.h" |
29 | #include "../../pci.h" | ||
29 | 30 | ||
30 | /* | 31 | /* |
31 | * Version Information | 32 | * Version Information |
@@ -219,8 +220,7 @@ static int __devinit aer_probe (struct pcie_device *dev, | |||
219 | 220 | ||
220 | /* Alloc rpc data structure */ | 221 | /* Alloc rpc data structure */ |
221 | if (!(rpc = aer_alloc_rpc(dev))) { | 222 | if (!(rpc = aer_alloc_rpc(dev))) { |
222 | printk(KERN_DEBUG "%s: Alloc rpc fails on PCIE device[%s]\n", | 223 | dev_printk(KERN_DEBUG, device, "alloc rpc failed\n"); |
223 | __func__, device->bus_id); | ||
224 | aer_remove(dev); | 224 | aer_remove(dev); |
225 | return -ENOMEM; | 225 | return -ENOMEM; |
226 | } | 226 | } |
@@ -228,8 +228,7 @@ static int __devinit aer_probe (struct pcie_device *dev, | |||
228 | /* Request IRQ ISR */ | 228 | /* Request IRQ ISR */ |
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 | dev_printk(KERN_DEBUG, device, "request IRQ failed\n"); |
232 | __func__, device->bus_id); | ||
233 | aer_remove(dev); | 232 | aer_remove(dev); |
234 | return status; | 233 | return status; |
235 | } | 234 | } |
@@ -273,7 +272,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) | |||
273 | * to issue Configuration Requests to those devices. | 272 | * to issue Configuration Requests to those devices. |
274 | */ | 273 | */ |
275 | msleep(200); | 274 | msleep(200); |
276 | printk(KERN_DEBUG "Complete link reset at Root[%s]\n", dev->dev.bus_id); | 275 | dev_printk(KERN_DEBUG, &dev->dev, "Root Port link has been reset\n"); |
277 | 276 | ||
278 | /* Enable Root Port's interrupt in response to error messages */ | 277 | /* Enable Root Port's interrupt in response to error messages */ |
279 | pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, &status); | 278 | pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, &status); |