perf: xgene: use devm_platform_ioremap_resource() to simplify code (7fdd7f7c) · Commits · 戴 / test

drivers/perf/xgene_pmu.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -1282,25 +1282,21 @@ static int acpi_pmu_probe_active_mcb_mcu_l3c(struct xgene_pmu *xgene_pmu,
		struct platform_device *pdev)
		{
		void __iomem csw_csr, mcba_csr, *mcbb_csr;
		struct resource *res;
		unsigned int reg;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
		csw_csr = devm_ioremap_resource(&pdev->dev, res);
		csw_csr = devm_platform_ioremap_resource(pdev, 1);
		if (IS_ERR(csw_csr)) {
		dev_err(&pdev->dev, "ioremap failed for CSW CSR resource\n");
		return PTR_ERR(csw_csr);
		}

		res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
		mcba_csr = devm_ioremap_resource(&pdev->dev, res);
		mcba_csr = devm_platform_ioremap_resource(pdev, 2);
		if (IS_ERR(mcba_csr)) {
		dev_err(&pdev->dev, "ioremap failed for MCBA CSR resource\n");
		return PTR_ERR(mcba_csr);
		}

		res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
		mcbb_csr = devm_ioremap_resource(&pdev->dev, res);
		mcbb_csr = devm_platform_ioremap_resource(pdev, 3);
		if (IS_ERR(mcbb_csr)) {
		dev_err(&pdev->dev, "ioremap failed for MCBB CSR resource\n");
		return PTR_ERR(mcbb_csr);
		@@ -1332,13 +1328,11 @@ static int acpi_pmu_v3_probe_active_mcb_mcu_l3c(struct xgene_pmu *xgene_pmu,
		struct platform_device *pdev)
		{
		void __iomem *csw_csr;
		struct resource *res;
		unsigned int reg;
		u32 mcb0routing;
		u32 mcb1routing;

		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
		csw_csr = devm_ioremap_resource(&pdev->dev, res);
		csw_csr = devm_platform_ioremap_resource(pdev, 1);
		if (IS_ERR(csw_csr)) {
		dev_err(&pdev->dev, "ioremap failed for CSW CSR resource\n");
		return PTR_ERR(csw_csr);

Admin message