diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2018-07-26 14:49:50 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2018-07-26 14:49:50 +1000 |
| commit | 537052df223408b25bdd77dbb9bf40080f514d3c (patch) | |
| tree | 3ed7c24ec0d51a3d5e849afb2aaafb7cf86bc99a /drivers/fsi/fsi-master-ast-cf.c | |
| parent | 502defbb476bca222ddb5a78f2cc19c12c4e42f3 (diff) | |
| download | lwn-537052df223408b25bdd77dbb9bf40080f514d3c.tar.gz lwn-537052df223408b25bdd77dbb9bf40080f514d3c.zip | |
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>
Diffstat (limited to 'drivers/fsi/fsi-master-ast-cf.c')
| -rw-r--r-- | drivers/fsi/fsi-master-ast-cf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/fsi/fsi-master-ast-cf.c b/drivers/fsi/fsi-master-ast-cf.c index 6a36220e4b40..04d10ea8d343 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 @@ 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; } |