diff options
| author | Bjorn Helgaas | 2016-12-12 11:25:07 -0600 |
|---|---|---|
| committer | Bjorn Helgaas | 2016-12-12 11:25:07 -0600 |
| commit | 9fb7454b1d8acdd9767f4cdc2f878c8c6de5ee9a (patch) | |
| tree | e974c1df7a6f2868be8682971fb2c5b417dcde9d /drivers/pci | |
| parent | a739d56dfba690e26fd5728f041e8910a16ede31 (diff) | |
| parent | ad719956a8487753e6514d7be3b4a6edc99e35bd (diff) | |
Merge branch 'pci/host-hisi' into next
* pci/host-hisi:
PCI: hisi: Remove redundant error message from hisi_pcie_probe()
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pcie-hisi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c index 07e82256efbf..a301a7187b30 100644 --- a/drivers/pci/host/pcie-hisi.c +++ b/drivers/pci/host/pcie-hisi.c @@ -284,10 +284,8 @@ static int hisi_pcie_probe(struct platform_device *pdev) reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi"); pp->dbi_base = devm_ioremap_resource(dev, reg); - if (IS_ERR(pp->dbi_base)) { - dev_err(dev, "cannot get rc_dbi base\n"); + if (IS_ERR(pp->dbi_base)) return PTR_ERR(pp->dbi_base); - } ret = hisi_add_pcie_port(hisi_pcie, pdev); if (ret) |