Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b2c983 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq 

Pull devfreq fixes from MyungJoo Ham.

* 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq:
  PM / devfreq: exynos-ppmu: Staticize event list
  PM / devfreq: exynos-ppmu: Handle return value of clk_prepare_enable
  PM / devfreq: exynos-nocp: Handle return value of clk_prepare_enable
parents 32c1431e 6b1355f9

drivers/devfreq/event/exynos-nocp.c

+5 −1
Original line number Diff line number Diff line
@@ -267,7 +267,11 @@ static int exynos_nocp_probe(struct platform_device *pdev) 
	}

	platform_set_drvdata(pdev, nocp);



	clk_prepare_enable(nocp->clk);

	ret = clk_prepare_enable(nocp->clk);

	if (ret) {

		dev_err(&pdev->dev, "failed to prepare ppmu clock\n");

		return ret;

	}



	pr_info("exynos-nocp: new NoC Probe device registered: %s\n",

			dev_name(dev));

drivers/devfreq/event/exynos-ppmu.c

+6 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct exynos_ppmu { 
	{ "ppmu-event2-"#name, PPMU_PMNCNT2 },	\

	{ "ppmu-event3-"#name, PPMU_PMNCNT3 }



struct __exynos_ppmu_events {

static struct __exynos_ppmu_events {

	char *name;

	int id;

} ppmu_events[] = {
@@ -648,7 +648,11 @@ static int exynos_ppmu_probe(struct platform_device *pdev) 
			dev_name(&pdev->dev), desc[i].name);

	}



	clk_prepare_enable(info->ppmu.clk);

	ret = clk_prepare_enable(info->ppmu.clk);

	if (ret) {

		dev_err(&pdev->dev, "failed to prepare ppmu clock\n");

		return ret;

	}



	return 0;

}