diff options
Diffstat (limited to 'drivers/pci/controller/dwc/pcie-kirin.c')
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-kirin.c | 24 | 
1 files changed, 8 insertions, 16 deletions
| diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c index c19617a912bd..e496f51e0152 100644 --- a/drivers/pci/controller/dwc/pcie-kirin.c +++ b/drivers/pci/controller/dwc/pcie-kirin.c @@ -3,7 +3,7 @@   * PCIe host controller driver for Kirin Phone SoCs   *   * Copyright (C) 2017 HiSilicon Electronics Co., Ltd. - *		http://www.huawei.com + *		https://www.huawei.com   *   * Author: Xiaowei Song <[email protected]>   */ @@ -147,23 +147,18 @@ static long kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,  static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie,  				    struct platform_device *pdev)  { -	struct device *dev = &pdev->dev; -	struct resource *apb; -	struct resource *phy; -	struct resource *dbi; - -	apb = platform_get_resource_byname(pdev, IORESOURCE_MEM, "apb"); -	kirin_pcie->apb_base = devm_ioremap_resource(dev, apb); +	kirin_pcie->apb_base = +		devm_platform_ioremap_resource_byname(pdev, "apb");  	if (IS_ERR(kirin_pcie->apb_base))  		return PTR_ERR(kirin_pcie->apb_base); -	phy = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy"); -	kirin_pcie->phy_base = devm_ioremap_resource(dev, phy); +	kirin_pcie->phy_base = +		devm_platform_ioremap_resource_byname(pdev, "phy");  	if (IS_ERR(kirin_pcie->phy_base))  		return PTR_ERR(kirin_pcie->phy_base); -	dbi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); -	kirin_pcie->pci->dbi_base = devm_ioremap_resource(dev, dbi); +	kirin_pcie->pci->dbi_base = +		devm_platform_ioremap_resource_byname(pdev, "dbi");  	if (IS_ERR(kirin_pcie->pci->dbi_base))  		return PTR_ERR(kirin_pcie->pci->dbi_base); @@ -455,11 +450,8 @@ static int kirin_pcie_add_msi(struct dw_pcie *pci,  	if (IS_ENABLED(CONFIG_PCI_MSI)) {  		irq = platform_get_irq(pdev, 0); -		if (irq < 0) { -			dev_err(&pdev->dev, -				"failed to get MSI IRQ (%d)\n", irq); +		if (irq < 0)  			return irq; -		}  		pci->pp.msi_irq = irq;  	} |