perf: hisi: use devm_platform_ioremap_resource() to simplify code (42c184ad) · Commits · 戴 / test

drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -243,8 +243,6 @@ MODULE_DEVICE_TABLE(acpi, hisi_ddrc_pmu_acpi_match);
		static int hisi_ddrc_pmu_init_data(struct platform_device *pdev,
		struct hisi_pmu *ddrc_pmu)
		{
		struct resource *res;

		/*
		* Use the SCCL_ID and DDRC channel ID to identify the
		* DDRC PMU, while SCCL_ID is in MPIDR[aff2].
		@@ -263,8 +261,7 @@ static int hisi_ddrc_pmu_init_data(struct platform_device *pdev,
		/* DDRC PMUs only share the same SCCL */
		ddrc_pmu->ccl_id = -1;

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -234,7 +234,6 @@ static int hisi_hha_pmu_init_data(struct platform_device *pdev,
		struct hisi_pmu *hha_pmu)
		{
		unsigned long long id;
		struct resource *res;
		acpi_status status;

		status = acpi_evaluate_integer(ACPI_HANDLE(&pdev->dev),
		@@ -256,8 +255,7 @@ static int hisi_hha_pmu_init_data(struct platform_device *pdev,
		/* HHA PMUs only share the same SCCL */
		hha_pmu->ccl_id = -1;

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -233,7 +233,6 @@ static int hisi_l3c_pmu_init_data(struct platform_device *pdev,
		struct hisi_pmu *l3c_pmu)
		{
		unsigned long long id;
		struct resource *res;
		acpi_status status;

		status = acpi_evaluate_integer(ACPI_HANDLE(&pdev->dev),
		@@ -259,8 +258,7 @@ static int hisi_l3c_pmu_init_data(struct platform_device *pdev,
		return -EINVAL;
		}

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