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

drivers/tty/nozomi.c: Use 'nozomi_setup_memory' instead of 'setup_memory'

Several architectures (e.g. microblaze, um, and score) have already have
extern 'setup_memory', so need use 'nozomi_setup_memory' instead of, or
will cause compiling issue.

The related error (with allmodconfig for microblaze):

CC [M] drivers/tty/nozomi.o
drivers/tty/nozomi.c:526:13: error: conflicting types for 'setup_memory'
static void setup_memory(struct nozomi *dc)
^
In file included from include/linux/mm.h:51:0,
from ./arch/microblaze/include/asm/io.h:17,
from include/linux/io.h:22,
from include/linux/pci.h:31,
from drivers/tty/nozomi.c:46:
./arch/microblaze/include/asm/pgtable.h:569:6: note: previous declaration of 'setup_memory' was here
void setup_memory(void);
^

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Acked-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Chen Gang and committed by
Greg Kroah-Hartman
7acb88af 4bb2bd07

+3 -3
+3 -3
drivers/tty/nozomi.c
··· 523 523 } 524 524 525 525 /* Setup pointers to different channels and also setup buffer sizes. */ 526 - static void setup_memory(struct nozomi *dc) 526 + static void nozomi_setup_memory(struct nozomi *dc) 527 527 { 528 528 void __iomem *offset = dc->base_addr + dc->config_table.dl_start; 529 529 /* The length reported is including the length field of 4 bytes, ··· 671 671 int i; 672 672 DBG1("Second phase, configuring card"); 673 673 674 - setup_memory(dc); 674 + nozomi_setup_memory(dc); 675 675 676 676 dc->port[PORT_MDM].toggle_ul = dc->config_table.toggle.mdm_ul; 677 677 dc->port[PORT_MDM].toggle_dl = dc->config_table.toggle.mdm_dl; ··· 705 705 dc->config_table.version); 706 706 707 707 /* Here we should disable all I/O over F32. */ 708 - setup_memory(dc); 708 + nozomi_setup_memory(dc); 709 709 710 710 /* 711 711 * We should send ALL channel pair tokens back along