Merge branch 'remotes/lorenzo/pci/xgene'

bjorn-helgaas · bjorn-helgaas · commit 09cfc9db2db1 · 2021-09-02T14:56:51.000-05:00
- Remove redundant dev_err() after devm_ioremap_resource() (ErKun Yang)

* remotes/lorenzo/pci/xgene:
  PCI: xgene-msi: Remove redundant dev_err() call in xgene_msi_probe()
diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c
@@ -448,7 +448,6 @@ static int xgene_msi_probe(struct platform_device *pdev)
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	xgene_msi->msi_regs = devm_ioremap_resource(&pdev->dev, res);
 	if (IS_ERR(xgene_msi->msi_regs)) {
-		dev_err(&pdev->dev, "no reg space\n");
 		rc = PTR_ERR(xgene_msi->msi_regs);
 		goto error;
 	}

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,6 @@ static int xgene_msi_probe(struct platform_device *pdev)`
`448`	`448`	`res = platform_get_resource(pdev, IORESOURCE_MEM, 0);`
`449`	`449`	`xgene_msi->msi_regs = devm_ioremap_resource(&pdev->dev, res);`
`450`	`450`	`if (IS_ERR(xgene_msi->msi_regs)) {`
`451`		`- dev_err(&pdev->dev, "no reg space\n");`
`452`	`451`	`rc = PTR_ERR(xgene_msi->msi_regs);`
`453`	`452`	`goto error;`
`454`	`453`	`}`