From 537052df223408b25bdd77dbb9bf40080f514d3c Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 26 Jul 2018 14:49:50 +1000
Subject: [PATCH] fsi: master-ast-cf: Rename dump_trace() to avoid name
collision
s390 defines a global dump_trace() symbol. Rename ours to
dump_ucode_trace() to avoid a collision in build tests.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
drivers/fsi/fsi-master-ast-cf.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c
index 6a36220e4b400..04d10ea8d343b 100644
--- a/drivers/fsi/fsi-master-ast-cf.c
+++ b/drivers/fsi/fsi-master-ast-cf.c
@@ -437,7 +437,7 @@ static int send_term(struct fsi_master_acf *master, uint8_t slave)
return 0;
}
-static void dump_trace(struct fsi_master_acf *master)
+static void dump_ucode_trace(struct fsi_master_acf *master)
{
char trbuf[52];
char *p;
@@ -488,7 +488,7 @@ static int handle_response(struct fsi_master_acf *master,
}
trace_fsi_master_acf_crc_rsp_error(master, crc_err_retries);
if (master->trace_enabled)
- dump_trace(master);
+ dump_ucode_trace(master);
rc = clock_zeros(master, FSI_MASTER_EPOLL_CLOCKS);
if (rc) {
dev_warn(master->dev,
@@ -525,7 +525,7 @@ static int handle_response(struct fsi_master_acf *master,
*/
dev_dbg(master->dev, "Busy, retrying...\n");
if (master->trace_enabled)
- dump_trace(master);
+ dump_ucode_trace(master);
rc = clock_zeros(master, FSI_MASTER_DPOLL_CLOCKS);
if (rc) {
dev_warn(master->dev,
@@ -550,13 +550,13 @@ static int handle_response(struct fsi_master_acf *master,
case FSI_RESP_ERRA:
dev_dbg(master->dev, "ERRA received\n");
if (master->trace_enabled)
- dump_trace(master);
+ dump_ucode_trace(master);
rc = -EIO;
break;
case FSI_RESP_ERRC:
dev_dbg(master->dev, "ERRC received\n");
if (master->trace_enabled)
- dump_trace(master);
+ dump_ucode_trace(master);
rc = -EAGAIN;
break;
}
--
GitLab