Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b6f3aa authored Jun 17, 2013 by Markos Chandras Committed by Ralf Baechle Jun 21, 2013

MIPS: sibyte: Declare the cfe_write() buffer as constant



The write() prototype expects a const char * as argument so declare
it as such.

Fixes the following build problem:

arch/mips/sibyte/common/cfe_console.c:23:5: error: passing argument 2 of
'cfe_write' discards 'const' qualifier from pointer target type [-Werror]
arch/mips/sibyte/common/cfe_console.c:34:4: error: passing argument 2 of
'cfe_write' makes pointer from integer without a cast [-Werror]

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: sibyte-users@bitmover.com
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5485/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 0156915c

arch/mips/fw/cfe/cfe_api.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -406,12 +406,12 @@ int cfe_setenv(char name, char val)
	return xiocb.xiocb_status;		return xiocb.xiocb_status;
	}		}

	int cfe_write(int handle, unsigned char *buffer, int length)		int cfe_write(int handle, const char *buffer, int length)
	{		{
	return cfe_writeblk(handle, 0, buffer, length);		return cfe_writeblk(handle, 0, buffer, length);
	}		}

	int cfe_writeblk(int handle, s64 offset, unsigned char *buffer, int length)		int cfe_writeblk(int handle, s64 offset, const char *buffer, int length)
	{		{
	struct cfe_xiocb xiocb;		struct cfe_xiocb xiocb;

arch/mips/include/asm/fw/cfe/cfe_api.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -115,8 +115,8 @@ int cfe_read(int handle, unsigned char *buffer, int length);
	int cfe_readblk(int handle, int64_t offset, unsigned char *buffer,		int cfe_readblk(int handle, int64_t offset, unsigned char *buffer,
	int length);		int length);
	int cfe_setenv(char name, char val);		int cfe_setenv(char name, char val);
	int cfe_write(int handle, unsigned char *buffer, int length);		int cfe_write(int handle, const char *buffer, int length);
	int cfe_writeblk(int handle, int64_t offset, unsigned char *buffer,		int cfe_writeblk(int handle, int64_t offset, const char *buffer,
	int length);		int length);

	#endif /* CFE_API_H */		#endif /* CFE_API_H */