[PATCH v1 4/5] driver/hwtracing/coresight: Use of_cpu_phandle_to_id for grabbing CPU id.
Alireza Sanaee <[email protected]>
| Newsgroups | org.kernel.vger.devicetree-spec,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Use the newly created API to grab CPU id. Signed-off-by: Alireza Sanaee <[email protected]> --- .../hwtracing/coresight/coresight-cti-platform.c | 15 +++------------ drivers/hwtracing/coresight/coresight-platform.c | 14 ++------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-cti-platform.c b/drivers/hwtracing/coresight/coresight-cti-platform.c index d0ae10bf6128..6a6e84245112 100644 --- a/drivers/hwtracing/coresight/coresight-cti-platform.c +++ b/drivers/hwtracing/coresight/coresight-cti-platform.c @@ -41,21 +41,12 @@ */ static int of_cti_get_cpu_at_node(const struct device_node *node) { + struct device_node *dn = NULL; int cpu; - struct device_node *dn; - if (node == NULL) - return -1; - - dn = of_parse_phandle(node, "cpu", 0); - /* CTI affinity defaults to no cpu */ - if (!dn) - return -1; - cpu = of_cpu_node_to_id(dn); + cpu = of_cpu_phandle_to_id(node, dn,"cpu"); of_node_put(dn); - - /* No Affinity if no cpu nodes are found */ - return (cpu < 0) ? -1 : cpu; + return cpu; } #else diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 8192ba3279f0..cb953f25da82 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -167,19 +167,9 @@ of_coresight_get_output_ports_node(const struct device_node *node) static int of_coresight_get_cpu(struct device *dev) { - int cpu; - struct device_node *dn; - - if (!dev->of_node) - return -ENODEV; - - dn = of_parse_phandle(dev->of_node, "cpu", 0); - if (!dn) - return -ENODEV; - - cpu = of_cpu_node_to_id(dn); + struct device_node *dn = NULL; + int cpu = of_cpu_phandle_to_id(dev->of_node, dn, "cpu"); of_node_put(dn); - return cpu; } -- 2.43.0