PM / devfreq: exynos-events: change matching code during probe (0ae9c321) · Commits · 戴 / test

drivers/devfreq/event/exynos-ppmu.c

+25 −13

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/of_address.h>
		#include <linux/of_device.h>
		#include <linux/platform_device.h>
		#include <linux/regmap.h>
		#include <linux/suspend.h>
		@@ -20,6 +21,11 @@

		#include "exynos-ppmu.h"

		enum exynos_ppmu_type {
		EXYNOS_TYPE_PPMU,
		EXYNOS_TYPE_PPMU_V2,
		};

		struct exynos_ppmu_data {
		struct clk *clk;
		};
		@@ -33,6 +39,7 @@ struct exynos_ppmu {
		struct regmap *regmap;

		struct exynos_ppmu_data ppmu;
		enum exynos_ppmu_type ppmu_type;
		};

		#define PPMU_EVENT(name) \
		@@ -486,31 +493,23 @@ static const struct devfreq_event_ops exynos_ppmu_v2_ops = {
		static const struct of_device_id exynos_ppmu_id_match[] = {
		{
		.compatible = "samsung,exynos-ppmu",
		.data = (void *)&exynos_ppmu_ops,
		.data = (void *)EXYNOS_TYPE_PPMU,
		}, {
		.compatible = "samsung,exynos-ppmu-v2",
		.data = (void *)&exynos_ppmu_v2_ops,
		.data = (void *)EXYNOS_TYPE_PPMU_V2,
		},
		{ /* sentinel */ },
		};
		MODULE_DEVICE_TABLE(of, exynos_ppmu_id_match);

		static struct devfreq_event_ops exynos_bus_get_ops(struct device_node np)
		{
		const struct of_device_id *match;

		match = of_match_node(exynos_ppmu_id_match, np);
		return (struct devfreq_event_ops *)match->data;
		}

		static int of_get_devfreq_events(struct device_node *np,
		struct exynos_ppmu *info)
		{
		struct devfreq_event_desc *desc;
		struct devfreq_event_ops *event_ops;
		struct device *dev = info->dev;
		struct device_node events_np, node;
		int i, j, count;
		const struct of_device_id *of_id;

		events_np = of_get_child_by_name(np, "events");
		if (!events_np) {
		@@ -518,7 +517,6 @@ static int of_get_devfreq_events(struct device_node *np,
		"failed to get child node of devfreq-event devices\n");
		return -EINVAL;
		}
		event_ops = exynos_bus_get_ops(np);

		count = of_get_child_count(events_np);
		desc = devm_kcalloc(dev, count, sizeof(*desc), GFP_KERNEL);
		@@ -526,6 +524,12 @@ static int of_get_devfreq_events(struct device_node *np,
		return -ENOMEM;
		info->num_events = count;

		of_id = of_match_device(exynos_ppmu_id_match, dev);
		if (of_id)
		info->ppmu_type = (enum exynos_ppmu_type)of_id->data;
		else
		return -EINVAL;

		j = 0;
		for_each_child_of_node(events_np, node) {
		for (i = 0; i < ARRAY_SIZE(ppmu_events); i++) {
		@@ -543,7 +547,15 @@ static int of_get_devfreq_events(struct device_node *np,
		continue;
		}

		desc[j].ops = event_ops;
		switch (info->ppmu_type) {
		case EXYNOS_TYPE_PPMU:
		desc[j].ops = &exynos_ppmu_ops;
		break;
		case EXYNOS_TYPE_PPMU_V2:
		desc[j].ops = &exynos_ppmu_v2_ops;
		break;
		}

		desc[j].driver_data = info;

		of_property_read_string(node, "event-name", &desc[j].name);

Admin message