Commit c57400bb authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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()
parents ccfc1d55 b1160a06

drivers/pci/controller/pcie-altera-msi.c

+1 −3
Original line number Diff line number Diff line
@@ -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;