From: Yang Li Date: Thu, 23 Mar 2023 09:16:44 +0000 (+0800) Subject: PCI: rcar-gen2: Use devm_platform_get_and_ioremap_resource() X-Git-Tag: v6.6-rc1~122^2~2^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da1e3277a8fe6bc0d368db7d3210e369566a47fb;p=thirdparty%2Flinux.git PCI: rcar-gen2: Use devm_platform_get_and_ioremap_resource() Convert calls to platform_get_resource() and devm_ioremap_resource() into a single call to devm_platform_get_and_ioremap_resource(), to simplify the code. This new helper added in commit 890cc39a8799 ("drivers: provide devm_platform_get_and_ioremap_resource()") does what both of the other separate functions do. [kwilczynski: commit log] Link: https://lore.kernel.org/linux-pci/20230323091644.91981-1-yang.lee@linux.alibaba.com Signed-off-by: Yang Li Signed-off-by: Krzysztof Wilczyński Reviewed-by: Geert Uytterhoeven --- diff --git a/drivers/pci/controller/pci-rcar-gen2.c b/drivers/pci/controller/pci-rcar-gen2.c index 839695791757d..d29866485361a 100644 --- a/drivers/pci/controller/pci-rcar-gen2.c +++ b/drivers/pci/controller/pci-rcar-gen2.c @@ -290,8 +290,7 @@ static int rcar_pci_probe(struct platform_device *pdev) priv = pci_host_bridge_priv(bridge); bridge->sysdata = priv; - cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - reg = devm_ioremap_resource(dev, cfg_res); + reg = devm_platform_get_and_ioremap_resource(pdev, 0, &cfg_res); if (IS_ERR(reg)) return PTR_ERR(reg);