Patchwork [U-Boot] stdio: constify "name" arg in public api

login
register
mail settings
Submitter Mike Frysinger
Date Oct. 20, 2010, 11:18 a.m.
Message ID <1287573483-6777-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/71907/
State Accepted
Commit d7be3056def73c0ab53b3907f9a70a73253a5ae9
Delegated to: Wolfgang Denk
Headers show

Comments

Mike Frysinger - Oct. 20, 2010, 11:18 a.m.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 common/console.c    |    4 ++--
 common/stdio.c      |    4 ++--
 include/common.h    |    2 +-
 include/iomux.h     |    2 +-
 include/stdio_dev.h |    4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
Wolfgang Denk - Nov. 28, 2010, 9:02 p.m.
Dear Mike Frysinger,

In message <1287573483-6777-1-git-send-email-vapier@gentoo.org> you wrote:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  common/console.c    |    4 ++--
>  common/stdio.c      |    4 ++--
>  include/common.h    |    2 +-
>  include/iomux.h     |    2 +-
>  include/stdio_dev.h |    4 ++--
>  5 files changed, 8 insertions(+), 8 deletions(-)

Applied to "next" branch, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/common/console.c b/common/console.c
index 7e01886..8c650e0 100644
--- a/common/console.c
+++ b/common/console.c
@@ -479,7 +479,7 @@  inline void dbg(const char *fmt, ...)
 
 /** U-Boot INIT FUNCTIONS *************************************************/
 
-struct stdio_dev *search_device(int flags, char *name)
+struct stdio_dev *search_device(int flags, const char *name)
 {
 	struct stdio_dev *dev;
 
@@ -491,7 +491,7 @@  struct stdio_dev *search_device(int flags, char *name)
 	return NULL;
 }
 
-int console_assign(int file, char *devname)
+int console_assign(int file, const char *devname)
 {
 	int flag;
 	struct stdio_dev *dev;
diff --git a/common/stdio.c b/common/stdio.c
index 2501369..462df24 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -105,7 +105,7 @@  struct list_head* stdio_get_list(void)
 	return &(devs.list);
 }
 
-struct stdio_dev* stdio_get_by_name(char* name)
+struct stdio_dev* stdio_get_by_name(const char *name)
 {
 	struct list_head *pos;
 	struct stdio_dev *dev;
@@ -155,7 +155,7 @@  int stdio_register (struct stdio_dev * dev)
  * returns 0 if success, -1 if device is assigned and 1 if devname not found
  */
 #ifdef	CONFIG_SYS_STDIO_DEREGISTER
-int stdio_deregister(char *devname)
+int stdio_deregister(const char *devname)
 {
 	int l;
 	struct list_head *pos;
diff --git a/include/common.h b/include/common.h
index 0686a17..9acd086 100644
--- a/include/common.h
+++ b/include/common.h
@@ -654,7 +654,7 @@  char *	strmhz(char *buf, long hz);
 /* common/console.c */
 int	console_init_f(void);	/* Before relocation; uses the serial  stuff	*/
 int	console_init_r(void);	/* After  relocation; uses the console stuff	*/
-int	console_assign (int file, char *devname);	/* Assign the console	*/
+int	console_assign(int file, const char *devname);	/* Assign the console	*/
 int	ctrlc (void);
 int	had_ctrlc (void);	/* have we had a Control-C since last clear? */
 void	clear_ctrlc (void);	/* clear the Control-C condition */
diff --git a/include/iomux.h b/include/iomux.h
index e38a81e..fcf0f93 100644
--- a/include/iomux.h
+++ b/include/iomux.h
@@ -43,6 +43,6 @@  extern int cd_count[MAX_FILES];
 
 int iomux_doenv(const int, const char *);
 void iomux_printdevs(const int);
-struct stdio_dev *search_device(int, char *);
+struct stdio_dev *search_device(int, const char *);
 
 #endif /* _IO_MUX_H */
diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index 83da4cd..82ad463 100644
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -93,10 +93,10 @@  int	stdio_register (struct stdio_dev * dev);
 int	stdio_init (void);
 void	stdio_print_current_devices(void);
 #ifdef CONFIG_SYS_STDIO_DEREGISTER
-int	stdio_deregister(char *devname);
+int	stdio_deregister(const char *devname);
 #endif
 struct list_head* stdio_get_list(void);
-struct stdio_dev* stdio_get_by_name(char* name);
+struct stdio_dev* stdio_get_by_name(const char* name);
 struct stdio_dev* stdio_clone(struct stdio_dev *dev);
 
 #ifdef CONFIG_ARM_DCC_MULTI