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

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

[Chen Gang]

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>
---
 drivers/tty/nozomi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index cd04293..74885af 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -523,7 +523,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
 }
 
 /* Setup pointers to different channels and also setup buffer sizes. */
-static void setup_memory(struct nozomi *dc)
+static void nozomi_setup_memory(struct nozomi *dc)
 {
 	void __iomem *offset = dc->base_addr + dc->config_table.dl_start;
 	/* The length reported is including the length field of 4 bytes,
@@ -671,7 +671,7 @@ static int nozomi_read_config_table(struct nozomi *dc)
 		int i;
 		DBG1("Second phase, configuring card");
 
-		setup_memory(dc);
+		nozomi_setup_memory(dc);
 
 		dc->port[PORT_MDM].toggle_ul = dc->config_table.toggle.mdm_ul;
 		dc->port[PORT_MDM].toggle_dl = dc->config_table.toggle.mdm_dl;
@@ -705,7 +705,7 @@ static int nozomi_read_config_table(struct nozomi *dc)
 			 dc->config_table.version);
 
 		/* Here we should disable all I/O over F32. */
-		setup_memory(dc);
+		nozomi_setup_memory(dc);
 
 		/*
 		 * We should send ALL channel pair tokens back along
-- 
1.7.11.7

Re: [PATCH] drivers/tty/nozomi.c: Use 'nozomi_setup_memory' instead of 'setup_memory'

[Jiri Slaby]

On 08/08/2014, 05:56 PM, Chen Gang wrote:
> 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>

Oh, sure. Thanks.

Acked-by: Jiri Slaby <jslaby@suse.cz>


-- 
js
suse labs