Re: [PATCH v4 2/5] drivers: devfreq: events: change matching code during probe

[Chanwoo Choi <cwchoi00@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 4474 bytes --]

Hi Lukasz,

2019년 6월 5일 (수) 18:13, Lukasz Luba <l.luba@partner.samsung.com>님이 작성:

> The patch changes the way how the 'ops' gets populated for different
> device versions. The matching function now uses 'of_device_id' in order
> to identify the device type.
>
> Signed-off-by: Lukasz Luba <l.luba@partner.samsung.com>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
>  drivers/devfreq/event/exynos-ppmu.c | 38 +++++++++++++++++++----------
>  1 file changed, 25 insertions(+), 13 deletions(-)
>


Acked-by: Chanwoo Choi <cw00.choi@samsung.com>



> diff --git a/drivers/devfreq/event/exynos-ppmu.c
> b/drivers/devfreq/event/exynos-ppmu.c
> index c2ea94957501..17f3c86a6f00 100644
> --- a/drivers/devfreq/event/exynos-ppmu.c
> +++ b/drivers/devfreq/event/exynos-ppmu.c
> @@ -16,6 +16,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>
> @@ -23,6 +24,11 @@
>
>  #include "exynos-ppmu.h"
>
> +enum exynos_ppmu_type {
> +       EXYNOS_TYPE_PPMU,
> +       EXYNOS_TYPE_PPMU_V2,
> +};
> +
>  struct exynos_ppmu_data {
>         struct clk *clk;
>  };
> @@ -36,6 +42,7 @@ struct exynos_ppmu {
>         struct regmap *regmap;
>
>         struct exynos_ppmu_data ppmu;
> +       enum exynos_ppmu_type ppmu_type;
>  };
>
>  #define PPMU_EVENT(name)                       \
> @@ -483,31 +490,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) {
> @@ -515,7 +514,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);
> @@ -523,6 +521,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++) {
> @@ -540,7 +544,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);
> --
> 2.17.1
>
>

[-- Attachment #2: Type: text/html, Size: 6084 bytes --]