|
21 | 21 | #include <linux/module.h>
|
22 | 22 | #include <linux/stddef.h>
|
23 | 23 | #include <linux/errno.h>
|
24 |
| -#include <linux/aer.h> |
25 | 24 |
|
26 | 25 | #include "dfl.h"
|
27 | 26 |
|
@@ -376,35 +375,29 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid)
|
376 | 375 | return ret;
|
377 | 376 | }
|
378 | 377 |
|
379 |
| - ret = pci_enable_pcie_error_reporting(pcidev); |
380 |
| - if (ret && ret != -EINVAL) |
381 |
| - dev_info(&pcidev->dev, "PCIE AER unavailable %d.\n", ret); |
382 |
| - |
383 | 378 | pci_set_master(pcidev);
|
384 | 379 |
|
385 | 380 | ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(64));
|
386 | 381 | if (ret)
|
387 | 382 | ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(32));
|
388 | 383 | if (ret) {
|
389 | 384 | dev_err(&pcidev->dev, "No suitable DMA support available.\n");
|
390 |
| - goto disable_error_report_exit; |
| 385 | + return ret; |
391 | 386 | }
|
392 | 387 |
|
393 | 388 | ret = cci_init_drvdata(pcidev);
|
394 | 389 | if (ret) {
|
395 | 390 | dev_err(&pcidev->dev, "Fail to init drvdata %d.\n", ret);
|
396 |
| - goto disable_error_report_exit; |
| 391 | + return ret; |
397 | 392 | }
|
398 | 393 |
|
399 | 394 | ret = cci_enumerate_feature_devs(pcidev);
|
400 |
| - if (!ret) |
| 395 | + if (ret) { |
| 396 | + dev_err(&pcidev->dev, "enumeration failure %d.\n", ret); |
401 | 397 | return ret;
|
| 398 | + } |
402 | 399 |
|
403 |
| - dev_err(&pcidev->dev, "enumeration failure %d.\n", ret); |
404 |
| - |
405 |
| -disable_error_report_exit: |
406 |
| - pci_disable_pcie_error_reporting(pcidev); |
407 |
| - return ret; |
| 400 | + return 0; |
408 | 401 | }
|
409 | 402 |
|
410 | 403 | static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs)
|
@@ -448,7 +441,6 @@ static void cci_pci_remove(struct pci_dev *pcidev)
|
448 | 441 | cci_pci_sriov_configure(pcidev, 0);
|
449 | 442 |
|
450 | 443 | cci_remove_feature_devs(pcidev);
|
451 |
| - pci_disable_pcie_error_reporting(pcidev); |
452 | 444 | }
|
453 | 445 |
|
454 | 446 | static struct pci_driver cci_pci_driver = {
|
|
0 commit comments