diff options
| -rw-r--r-- | drivers/pci/pcie/aer.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index f8fc2114ad39..63a73a8c933a 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c | |||
| @@ -964,8 +964,7 @@ static bool find_source_device(struct pci_dev *parent, | |||
| 964 | pci_walk_bus(parent->subordinate, find_device_iter, e_info); | 964 | pci_walk_bus(parent->subordinate, find_device_iter, e_info); |
| 965 | 965 | ||
| 966 | if (!e_info->error_dev_num) { | 966 | if (!e_info->error_dev_num) { |
| 967 | pci_printk(KERN_DEBUG, parent, "can't find device of ID%04x\n", | 967 | pci_info(parent, "can't find device of ID%04x\n", e_info->id); |
| 968 | e_info->id); | ||
| 969 | return false; | 968 | return false; |
| 970 | } | 969 | } |
| 971 | return true; | 970 | return true; |
| @@ -1379,18 +1378,16 @@ static int aer_probe(struct pcie_device *dev) | |||
| 1379 | struct device *device = &dev->device; | 1378 | struct device *device = &dev->device; |
| 1380 | 1379 | ||
| 1381 | rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL); | 1380 | rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL); |
| 1382 | if (!rpc) { | 1381 | if (!rpc) |
| 1383 | dev_printk(KERN_DEBUG, device, "alloc AER rpc failed\n"); | ||
| 1384 | return -ENOMEM; | 1382 | return -ENOMEM; |
| 1385 | } | 1383 | |
| 1386 | rpc->rpd = dev->port; | 1384 | rpc->rpd = dev->port; |
| 1387 | set_service_data(dev, rpc); | 1385 | set_service_data(dev, rpc); |
| 1388 | 1386 | ||
| 1389 | status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr, | 1387 | status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr, |
| 1390 | IRQF_SHARED, "aerdrv", dev); | 1388 | IRQF_SHARED, "aerdrv", dev); |
| 1391 | if (status) { | 1389 | if (status) { |
| 1392 | dev_printk(KERN_DEBUG, device, "request AER IRQ %d failed\n", | 1390 | dev_err(device, "request AER IRQ %d failed\n", dev->irq); |
| 1393 | dev->irq); | ||
| 1394 | return status; | 1391 | return status; |
| 1395 | } | 1392 | } |
| 1396 | 1393 | ||
| @@ -1419,7 +1416,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) | |||
| 1419 | pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32); | 1416 | pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32); |
| 1420 | 1417 | ||
| 1421 | rc = pci_bus_error_reset(dev); | 1418 | rc = pci_bus_error_reset(dev); |
| 1422 | pci_printk(KERN_DEBUG, dev, "Root Port link has been reset\n"); | 1419 | pci_info(dev, "Root Port link has been reset\n"); |
| 1423 | 1420 | ||
| 1424 | /* Clear Root Error Status */ | 1421 | /* Clear Root Error Status */ |
| 1425 | pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, ®32); | 1422 | pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, ®32); |
