| From 547912e8503a4e18aaaa49decf84fc629d89d06f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 20 Sep 2018 13:17:44 -0600 |
| Subject: coresight: Use ERR_CAST instead of ERR_PTR |
| |
| From: zhong jiang <zhongjiang@huawei.com> |
| |
| [ Upstream commit bbd35ba6fab5419e58e96f35f1431f13bdc14f98 ] |
| |
| Use ERR_CAT inlined function to replace the ERR_PTR(PTR_ERR). It |
| make the code more concise. |
| |
| Signed-off-by: zhong jiang <zhongjiang@huawei.com> |
| Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hwtracing/coresight/coresight-tmc-etr.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c |
| index 2eda5de304c20..11963647e19ae 100644 |
| --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c |
| +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c |
| @@ -536,7 +536,7 @@ tmc_init_etr_sg_table(struct device *dev, int node, |
| sg_table = tmc_alloc_sg_table(dev, node, nr_tpages, nr_dpages, pages); |
| if (IS_ERR(sg_table)) { |
| kfree(etr_table); |
| - return ERR_PTR(PTR_ERR(sg_table)); |
| + return ERR_CAST(sg_table); |
| } |
| |
| etr_table->sg_table = sg_table; |
| -- |
| 2.20.1 |
| |