aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/ipmi/ipmi_msghandler.c9
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c6
-rw-r--r--include/linux/ipmi_smi.h2
3 files changed, 8 insertions, 9 deletions
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 5b13579ca21d..8c4baddd3731 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -1941,7 +1941,7 @@ static int stat_file_read_proc(char *page, char **start, off_t off,
1941#endif /* CONFIG_PROC_FS */ 1941#endif /* CONFIG_PROC_FS */
1942 1942
1943int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name, 1943int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
1944 read_proc_t *read_proc, write_proc_t *write_proc, 1944 read_proc_t *read_proc,
1945 void *data, struct module *owner) 1945 void *data, struct module *owner)
1946{ 1946{
1947 int rv = 0; 1947 int rv = 0;
@@ -1968,7 +1968,6 @@ int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
1968 } else { 1968 } else {
1969 file->data = data; 1969 file->data = data;
1970 file->read_proc = read_proc; 1970 file->read_proc = read_proc;
1971 file->write_proc = write_proc;
1972 file->owner = owner; 1971 file->owner = owner;
1973 1972
1974 mutex_lock(&smi->proc_entry_lock); 1973 mutex_lock(&smi->proc_entry_lock);
@@ -1997,17 +1996,17 @@ static int add_proc_entries(ipmi_smi_t smi, int num)
1997 1996
1998 if (rv == 0) 1997 if (rv == 0)
1999 rv = ipmi_smi_add_proc_entry(smi, "stats", 1998 rv = ipmi_smi_add_proc_entry(smi, "stats",
2000 stat_file_read_proc, NULL, 1999 stat_file_read_proc,
2001 smi, THIS_MODULE); 2000 smi, THIS_MODULE);
2002 2001
2003 if (rv == 0) 2002 if (rv == 0)
2004 rv = ipmi_smi_add_proc_entry(smi, "ipmb", 2003 rv = ipmi_smi_add_proc_entry(smi, "ipmb",
2005 ipmb_file_read_proc, NULL, 2004 ipmb_file_read_proc,
2006 smi, THIS_MODULE); 2005 smi, THIS_MODULE);
2007 2006
2008 if (rv == 0) 2007 if (rv == 0)
2009 rv = ipmi_smi_add_proc_entry(smi, "version", 2008 rv = ipmi_smi_add_proc_entry(smi, "version",
2010 version_file_read_proc, NULL, 2009 version_file_read_proc,
2011 smi, THIS_MODULE); 2010 smi, THIS_MODULE);
2012#endif /* CONFIG_PROC_FS */ 2011#endif /* CONFIG_PROC_FS */
2013 2012
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 97b6225c070b..5a5455585c1d 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2892,7 +2892,7 @@ static int try_smi_init(struct smi_info *new_smi)
2892 } 2892 }
2893 2893
2894 rv = ipmi_smi_add_proc_entry(new_smi->intf, "type", 2894 rv = ipmi_smi_add_proc_entry(new_smi->intf, "type",
2895 type_file_read_proc, NULL, 2895 type_file_read_proc,
2896 new_smi, THIS_MODULE); 2896 new_smi, THIS_MODULE);
2897 if (rv) { 2897 if (rv) {
2898 printk(KERN_ERR 2898 printk(KERN_ERR
@@ -2902,7 +2902,7 @@ static int try_smi_init(struct smi_info *new_smi)
2902 } 2902 }
2903 2903
2904 rv = ipmi_smi_add_proc_entry(new_smi->intf, "si_stats", 2904 rv = ipmi_smi_add_proc_entry(new_smi->intf, "si_stats",
2905 stat_file_read_proc, NULL, 2905 stat_file_read_proc,
2906 new_smi, THIS_MODULE); 2906 new_smi, THIS_MODULE);
2907 if (rv) { 2907 if (rv) {
2908 printk(KERN_ERR 2908 printk(KERN_ERR
@@ -2912,7 +2912,7 @@ static int try_smi_init(struct smi_info *new_smi)
2912 } 2912 }
2913 2913
2914 rv = ipmi_smi_add_proc_entry(new_smi->intf, "params", 2914 rv = ipmi_smi_add_proc_entry(new_smi->intf, "params",
2915 param_read_proc, NULL, 2915 param_read_proc,
2916 new_smi, THIS_MODULE); 2916 new_smi, THIS_MODULE);
2917 if (rv) { 2917 if (rv) {
2918 printk(KERN_ERR 2918 printk(KERN_ERR
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 845a8473ee5d..62b73668b602 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -229,7 +229,7 @@ static inline void ipmi_free_smi_msg(struct ipmi_smi_msg *msg)
229 directory for this interface. Note that the entry will 229 directory for this interface. Note that the entry will
230 automatically be dstroyed when the interface is destroyed. */ 230 automatically be dstroyed when the interface is destroyed. */
231int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name, 231int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
232 read_proc_t *read_proc, write_proc_t *write_proc, 232 read_proc_t *read_proc,
233 void *data, struct module *owner); 233 void *data, struct module *owner);
234 234
235#endif /* __LINUX_IPMI_SMI_H */ 235#endif /* __LINUX_IPMI_SMI_H */