summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Dreier <roland@topspin.com>2004-09-02 20:26:16 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-09-02 20:26:16 -0700
commit48d43bd7e7c9db952be7907b2e50efbcf3d2b9b1 (patch)
tree62f441143295f34ba738da05b9db0511aca0ef5f
parentc77960329ba6a2a819b777224b23039ca2b2f927 (diff)
[PATCH] fix proc_symlink() warning with CONFIG_PROC_FS=n
The last parameter of proc_symlink is usually a "const char *", but the stub in <linux/proc_fs.h> for CONFIG_PROC_FS=n omits the const and makes its last parameter a "char *". This causes a warning about discarding qualifiers for any code that passes something const for that last parameter. This patch fixes that up and also, for neatness's sake, makes the stub for create_proc_read_entry() match the usual prototype more exactly (use read_proc_t rather than the underlying function pointer type). Signed-off-by: Roland Dreier <roland@topspin.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/proc_fs.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 65f18e551529..abcfc4bca268 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -206,14 +206,13 @@ static inline struct proc_dir_entry *create_proc_entry(const char *name,
#define remove_proc_entry(name, parent) do {} while (0)
static inline struct proc_dir_entry *proc_symlink(const char *name,
- struct proc_dir_entry *parent,char *dest) {return NULL;}
+ struct proc_dir_entry *parent,const char *dest) {return NULL;}
static inline struct proc_dir_entry *proc_mkdir(const char *name,
struct proc_dir_entry *parent) {return NULL;}
static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
mode_t mode, struct proc_dir_entry *base,
- int (*read_proc)(char *, char **, off_t, int, int *, void *),
- void * data) { return NULL; }
+ read_proc_t *read_proc, void * data) { return NULL; }
static inline struct proc_dir_entry *create_proc_info_entry(const char *name,
mode_t mode, struct proc_dir_entry *base, get_info_t *get_info)
{ return NULL; }