summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2021-05-04 10:43:25 -0500
committerBjorn Helgaas <bhelgaas@google.com>2021-05-04 10:43:25 -0500
commitc57400bbe15657d133da86c1b6978adc1e2c8990 (patch)
treea492a087f3dc7837ff41dd24e2fc015c28ff2bd1 /drivers/pci
parentccfc1d557023af3f53da954402f9784cea2597d7 (diff)
parentb1160a06e0ea8c59454bc13b8d2a21cf569c0ff5 (diff)
Merge branch 'remotes/lorenzo/pci/altera-msi'
- Remove redundant dev_err() for devm_ioremap_resource() failure (Chen Hui) * remotes/lorenzo/pci/altera-msi: PCI: altera-msi: Remove redundant dev_err call in altera_msi_probe()
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/pcie-altera-msi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c
index 42691dd8ebef..98aa1dccc6e6 100644
--- a/drivers/pci/controller/pcie-altera-msi.c
+++ b/drivers/pci/controller/pcie-altera-msi.c
@@ -236,10 +236,8 @@ static int altera_msi_probe(struct platform_device *pdev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"vector_slave");
msi->vector_base = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(msi->vector_base)) {
- dev_err(&pdev->dev, "failed to map vector_slave memory\n");
+ if (IS_ERR(msi->vector_base))
return PTR_ERR(msi->vector_base);
- }
msi->vector_phy = res->start;