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

This commit is contained in:
qctecmdr 2021-08-12 23:45:39 -07:00 committed by Gerrit - the friendly Code Review server
commit 0cb9813875

View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* Copyright (c) 2014, 2021 The Linux Foundation. All rights reserved.
*/
#include <linux/bitops.h>
@ -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>
@ -1957,7 +1958,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;