diff options
| author |   Marc Zyngier <maz@kernel.org> | 2021-04-13 17:47:55 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-13 17:47:55 +0100 |
| commit | a2387e0a1315ac0af4be2158c174ca882c1d27a9 (patch) | |
| tree | a087ba8bbea9e7bdbe5959ea60248bea61a9f54a | |
| parent | Merge remote-tracking branch 'arm64/for-next/neon-softirqs-disabled' into kvmarm-master/next (diff) | |
| parent | coresight: trbe: Fix return value check in arm_trbe_register_coresight_cpu() (diff) | |
| download | linux-dev-a2387e0a1315ac0af4be2158c174ca882c1d27a9.tar.xz linux-dev-a2387e0a1315ac0af4be2158c174ca882c1d27a9.zip | |
Merge remote-tracking branch 'coresight/next-ETE-TRBE' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-core.c | 2 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-trbe.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c index 55c645616bf6..ca75b0b54e1f 100644 --- a/drivers/hwtracing/coresight/coresight-core.c +++ b/drivers/hwtracing/coresight/coresight-core.c @@ -23,7 +23,7 @@ #include "coresight-priv.h" static DEFINE_MUTEX(coresight_mutex); -DEFINE_PER_CPU(struct coresight_device *, csdev_sink); +static DEFINE_PER_CPU(struct coresight_device *, csdev_sink); /** * struct coresight_node - elements of a path, from source to sink diff --git a/drivers/hwtracing/coresight/coresight-trbe.c b/drivers/hwtracing/coresight/coresight-trbe.c index 5ce239875c98..176868496879 100644 --- a/drivers/hwtracing/coresight/coresight-trbe.c +++ b/drivers/hwtracing/coresight/coresight-trbe.c @@ -871,7 +871,7 @@ static void arm_trbe_register_coresight_cpu(struct trbe_drvdata *drvdata, int cp dev = &cpudata->drvdata->pdev->dev; desc.name = devm_kasprintf(dev, GFP_KERNEL, "trbe%d", cpu); - if (IS_ERR(desc.name)) + if (!desc.name) goto cpu_clear; desc.type = CORESIGHT_DEV_TYPE_SINK; |