github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-30 11:11:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "coresight: etm4x: Fetch device name in sysfs from device tree"

Browse Source
This commit is contained in:
qctecmdr 2022-10-14 13:36:41 -07:00 committed by Gerrit - the friendly Code Review server
commit e7af56b81b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwtracing/coresight/coresight-etm4x-core.c
View File

@ -26,6 +26,7 @@
#include <linux/amba/bus.h>
#include <linux/seq_file.h>
#include <linux/uaccess.h>
#include <linux/of.h>
#include <linux/perf_event.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
@ -1966,7 +1967,8 @@ static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid)
type_name = "etm";
}
desc.name = devm_kasprintf(dev, GFP_KERNEL,
if (of_property_read_string(dev->of_node, "coresight-name", &desc.name))
desc.name = devm_kasprintf(dev, GFP_KERNEL,
"%s%d", type_name, drvdata->cpu);
if (!desc.name)
return -ENOMEM;