Linux-PCI Archive on lore.kernel.org
 help / color / Atom feed
From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: Dejin Zheng <zhengdejin5@gmail.com>
Cc: jingoohan1@gmail.com, robh@kernel.org, bhelgaas@google.com,
	kgene@kernel.org, thomas.petazzoni@bootlin.com,
	nsaenzjulienne@suse.de, f.fainelli@gmail.com,
	jquinlan@broadcom.com, krzk@kernel.org,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] PCI: controller: convert to devm_platform_ioremap_resource()
Date: Tue, 7 Jul 2020 14:37:07 +0100
Message-ID: <20200707133707.GA17163@e121166-lin.cambridge.arm.com> (raw)
In-Reply-To: <20200526160110.31898-1-zhengdejin5@gmail.com>

On Wed, May 27, 2020 at 12:01:10AM +0800, Dejin Zheng wrote:
> use devm_platform_ioremap_resource() to simplify code, it
> contains platform_get_resource() and devm_ioremap_resource().
> 
> Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
> ---
>  drivers/pci/controller/dwc/pci-exynos.c | 4 +---
>  drivers/pci/controller/pci-aardvark.c   | 5 ++---
>  drivers/pci/controller/pci-ftpci100.c   | 4 +---
>  drivers/pci/controller/pci-versatile.c  | 6 ++----
>  drivers/pci/controller/pcie-brcmstb.c   | 4 +---
>  5 files changed, 7 insertions(+), 16 deletions(-)

Can you rebase it please against:

git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git pci/misc

I will apply it then (please carry over the review tags).

Lorenzo

> diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c
> index c5043d951e80..5791039d6a54 100644
> --- a/drivers/pci/controller/dwc/pci-exynos.c
> +++ b/drivers/pci/controller/dwc/pci-exynos.c
> @@ -84,14 +84,12 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev,
>  {
>  	struct dw_pcie *pci = ep->pci;
>  	struct device *dev = pci->dev;
> -	struct resource *res;
>  
>  	ep->mem_res = devm_kzalloc(dev, sizeof(*ep->mem_res), GFP_KERNEL);
>  	if (!ep->mem_res)
>  		return -ENOMEM;
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	ep->mem_res->elbi_base = devm_ioremap_resource(dev, res);
> +	ep->mem_res->elbi_base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(ep->mem_res->elbi_base))
>  		return PTR_ERR(ep->mem_res->elbi_base);
>  
> diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
> index 90ff291c24f0..0d98f9b04daa 100644
> --- a/drivers/pci/controller/pci-aardvark.c
> +++ b/drivers/pci/controller/pci-aardvark.c
> @@ -1105,7 +1105,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
>  	struct advk_pcie *pcie;
> -	struct resource *res, *bus;
> +	struct resource *bus;
>  	struct pci_host_bridge *bridge;
>  	int ret, irq;
>  
> @@ -1116,8 +1116,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
>  	pcie = pci_host_bridge_priv(bridge);
>  	pcie->pdev = pdev;
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	pcie->base = devm_ioremap_resource(dev, res);
> +	pcie->base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(pcie->base))
>  		return PTR_ERR(pcie->base);
>  
> diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
> index 1b67564de7af..221dfc9dc81b 100644
> --- a/drivers/pci/controller/pci-ftpci100.c
> +++ b/drivers/pci/controller/pci-ftpci100.c
> @@ -422,7 +422,6 @@ static int faraday_pci_probe(struct platform_device *pdev)
>  	struct device *dev = &pdev->dev;
>  	const struct faraday_pci_variant *variant =
>  		of_device_get_match_data(dev);
> -	struct resource *regs;
>  	struct resource_entry *win;
>  	struct faraday_pci *p;
>  	struct resource *io;
> @@ -465,8 +464,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
>  		return ret;
>  	}
>  
> -	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	p->base = devm_ioremap_resource(dev, regs);
> +	p->base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(p->base))
>  		return PTR_ERR(p->base);
>  
> diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c
> index b911359b6d81..b34bbfe611e7 100644
> --- a/drivers/pci/controller/pci-versatile.c
> +++ b/drivers/pci/controller/pci-versatile.c
> @@ -77,13 +77,11 @@ static int versatile_pci_probe(struct platform_device *pdev)
>  	if (!bridge)
>  		return -ENOMEM;
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	versatile_pci_base = devm_ioremap_resource(dev, res);
> +	versatile_pci_base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(versatile_pci_base))
>  		return PTR_ERR(versatile_pci_base);
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> -	versatile_cfg_base[0] = devm_ioremap_resource(dev, res);
> +	versatile_cfg_base[0] = devm_platform_ioremap_resource(pdev, 1);
>  	if (IS_ERR(versatile_cfg_base[0]))
>  		return PTR_ERR(versatile_cfg_base[0]);
>  
> diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
> index 7730ea845ff2..04bbf9b40193 100644
> --- a/drivers/pci/controller/pcie-brcmstb.c
> +++ b/drivers/pci/controller/pcie-brcmstb.c
> @@ -934,7 +934,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
>  	struct device_node *fw_np;
>  	struct brcm_pcie *pcie;
>  	struct pci_bus *child;
> -	struct resource *res;
>  	int ret;
>  
>  	/*
> @@ -959,8 +958,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
>  	pcie->dev = &pdev->dev;
>  	pcie->np = np;
>  
> -	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	pcie->base = devm_ioremap_resource(&pdev->dev, res);
> +	pcie->base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(pcie->base))
>  		return PTR_ERR(pcie->base);
>  
> -- 
> 2.25.0
> 

  parent reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-26 16:01 Dejin Zheng
2020-06-01 22:15 ` Rob Herring
2020-07-07 13:37 ` Lorenzo Pieralisi [this message]
2020-07-08 16:03   ` Dejin Zheng
2020-07-08 15:56 ` [PATCH v2] " Dejin Zheng
2020-07-09 10:36   ` Lorenzo Pieralisi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200707133707.GA17163@e121166-lin.cambridge.arm.com \
    --to=lorenzo.pieralisi@arm.com \
    --cc=bhelgaas@google.com \
    --cc=f.fainelli@gmail.com \
    --cc=jingoohan1@gmail.com \
    --cc=jquinlan@broadcom.com \
    --cc=kgene@kernel.org \
    --cc=krzk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=nsaenzjulienne@suse.de \
    --cc=robh@kernel.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=zhengdejin5@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-PCI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-pci/0 linux-pci/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-pci linux-pci/ https://lore.kernel.org/linux-pci \
		linux-pci@vger.kernel.org
	public-inbox-index linux-pci

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-pci


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git