redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Benjamin Herrenschmidt 2018-07-26 14:49:50 +10:00
parent 502defbb47
commit 537052df22
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/fsi/fsi-master-ast-cf.c
View File

@ -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 @@ retry:
}
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 @@ retry:
*/
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 @@ retry:
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;
}