Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -5
+5 -5
drivers/fsi/fsi-master-ast-cf.c
··· 437 437 return 0; 438 438 } 439 439 440 - static void dump_trace(struct fsi_master_acf *master) 440 + static void dump_ucode_trace(struct fsi_master_acf *master) 441 441 { 442 442 char trbuf[52]; 443 443 char *p; ··· 488 488 } 489 489 trace_fsi_master_acf_crc_rsp_error(master, crc_err_retries); 490 490 if (master->trace_enabled) 491 - dump_trace(master); 491 + dump_ucode_trace(master); 492 492 rc = clock_zeros(master, FSI_MASTER_EPOLL_CLOCKS); 493 493 if (rc) { 494 494 dev_warn(master->dev, ··· 525 525 */ 526 526 dev_dbg(master->dev, "Busy, retrying...\n"); 527 527 if (master->trace_enabled) 528 - dump_trace(master); 528 + dump_ucode_trace(master); 529 529 rc = clock_zeros(master, FSI_MASTER_DPOLL_CLOCKS); 530 530 if (rc) { 531 531 dev_warn(master->dev, ··· 550 550 case FSI_RESP_ERRA: 551 551 dev_dbg(master->dev, "ERRA received\n"); 552 552 if (master->trace_enabled) 553 - dump_trace(master); 553 + dump_ucode_trace(master); 554 554 rc = -EIO; 555 555 break; 556 556 case FSI_RESP_ERRC: 557 557 dev_dbg(master->dev, "ERRC received\n"); 558 558 if (master->trace_enabled) 559 - dump_trace(master); 559 + dump_ucode_trace(master); 560 560 rc = -EAGAIN; 561 561 break; 562 562 }