From: Andrew Morton - Be consistent about naming function args (it's useful) - Be consistent about spaces-after-asterisks (we don't). - Remove weird semicolons in empty functions. Cc: Greg KH Signed-off-by: Andrew Morton --- include/linux/sysfs.h | 159 +++++++++++++++++++--------------------- 1 files changed, 79 insertions(+), 80 deletions(-) diff -puN include/linux/sysfs.h~sysfs_h-cleanup include/linux/sysfs.h --- devel/include/linux/sysfs.h~sysfs_h-cleanup 2006-03-07 23:53:01.000000000 -0800 +++ devel-akpm/include/linux/sysfs.h 2006-03-07 23:53:01.000000000 -0800 @@ -27,31 +27,38 @@ struct attribute_group { }; - /** - * Use these macros to make defining attributes easier. See include/linux/device.h - * for examples.. + * Use these macros to make defining attributes easier. See + * include/linux/device.h for examples. */ -#define __ATTR(_name,_mode,_show,_store) { \ - .attr = {.name = __stringify(_name), .mode = _mode, .owner = THIS_MODULE }, \ +#define __ATTR(_name,_mode,_show,_store) { \ + .attr = { \ + .name = __stringify(_name), \ + .mode = _mode, \ + .owner = THIS_MODULE, \ + }, \ .show = _show, \ .store = _store, \ } -#define __ATTR_RO(_name) { \ - .attr = { .name = __stringify(_name), .mode = 0444, .owner = THIS_MODULE }, \ - .show = _name##_show, \ -} - -#define __ATTR_RELAY(_name,_buffer_size,_nr_buffers) { \ - .attr = { \ - .owner = THIS_MODULE, \ - .name = __stringify(_name), \ - .mode = 0400, \ - }, \ - .subbuf_size = _buffer_size, \ - .n_subbufs = _nr_buffers, \ +#define __ATTR_RO(_name) { \ + .attr = { \ + .name = __stringify(_name), \ + .mode = 0444, \ + .owner = THIS_MODULE, \ + }, \ + .show = _name##_show, \ +} + +#define __ATTR_RELAY(_name,_buffer_size,_nr_buffers) { \ + .attr = { \ + .owner = THIS_MODULE, \ + .name = __stringify(_name), \ + .mode = 0400, \ + }, \ + .subbuf_size = _buffer_size, \ + .n_subbufs = _nr_buffers, \ } #define __ATTR_NULL { .attr = { .name = NULL } } @@ -64,10 +71,12 @@ struct bin_attribute { struct attribute attr; size_t size; void *private; - ssize_t (*read)(struct kobject *, char *, loff_t, size_t); - ssize_t (*write)(struct kobject *, char *, loff_t, size_t); - int (*mmap)(struct kobject *, struct bin_attribute *attr, - struct vm_area_struct *vma); + ssize_t (*read)(struct kobject *kobj, char *buf, loff_t off, + size_t count); + ssize_t (*write)(struct kobject *kobj, char *buf, loff_t off, + size_t count); + int (*mmap)(struct kobject *kobj, struct bin_attribute *attr, + struct vm_area_struct *vma); }; struct relay_attribute { @@ -80,19 +89,20 @@ struct relay_attribute { }; struct sysfs_ops { - ssize_t (*show)(struct kobject *, struct attribute *,char *); - ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t); + ssize_t (*show)(struct kobject *kobj, struct attribute *a, char *page); + ssize_t (*store)(struct kobject *kobj, struct attribute *a, + const char *page, size_t); }; struct sysfs_dirent { atomic_t s_count; struct list_head s_sibling; struct list_head s_children; - void * s_element; + void *s_element; int s_type; umode_t s_mode; - struct dentry * s_dentry; - struct iattr * s_iattr; + struct dentry *s_dentry; + struct iattr *s_iattr; }; #define SYSFS_ROOT 0x0001 @@ -105,51 +115,36 @@ struct sysfs_dirent { SYSFS_KOBJ_LINK | SYSFS_KOBJ_RELAY_ATTR) #if defined(CONFIG_RELAY) && defined(CONFIG_SYSFS) -int sysfs_create_relay_file(struct kobject *, struct relay_attribute *); -void sysfs_remove_relay_file(struct kobject *, struct relay_attribute *); +int sysfs_create_relay_file(struct kobject *kobj, struct relay_attribute *a); +void sysfs_remove_relay_file(struct kobject *kobj, struct relay_attribute *a); #else -static inline int sysfs_create_relay_file(struct kobject *kobj, struct relay_attribute *attr) +static inline int sysfs_create_relay_file(struct kobject *kobj, + struct relay_attribute *attr) { return 0; } -static inline void sysfs_remove_relay_file(struct kobject *kobj, struct relay_attribute *attr) +static inline void sysfs_remove_relay_file(struct kobject *kobj, + struct relay_attribute *attr) { } #endif /* CONFIG_RELAY && CONFIG_SYSFS */ #ifdef CONFIG_SYSFS -extern int -sysfs_create_dir(struct kobject *); - -extern void -sysfs_remove_dir(struct kobject *); - -extern int -sysfs_rename_dir(struct kobject *, const char *new_name); - -extern int -sysfs_create_file(struct kobject *, const struct attribute *); - -extern int -sysfs_update_file(struct kobject *, const struct attribute *); - -extern int -sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode); - -extern void -sysfs_remove_file(struct kobject *, const struct attribute *); - -extern int -sysfs_create_link(struct kobject * kobj, struct kobject * target, const char * name); - -extern void -sysfs_remove_link(struct kobject *, const char * name); - -int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr); -int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr); - +extern int sysfs_create_dir(struct kobject *kobj); +extern void sysfs_remove_dir(struct kobject *kobj); +extern int sysfs_rename_dir(struct kobject *kobj, const char *new_name); +extern int sysfs_create_file(struct kobject *kobj, const struct attribute *a); +extern int sysfs_update_file(struct kobject *kobj, const struct attribute *a); +extern int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, + mode_t mode); +extern void sysfs_remove_file(struct kobject *kobj, const struct attribute *a); +extern int sysfs_create_link(struct kobject *kobj, struct kobject *target, + const char *name); +extern void sysfs_remove_link(struct kobject *kobj, const char *name); +int sysfs_create_bin_file(struct kobject *kobj, struct bin_attribute *attr); +int sysfs_remove_bin_file(struct kobject *kobj, struct bin_attribute *attr); int sysfs_create_group(struct kobject *, const struct attribute_group *); void sysfs_remove_group(struct kobject *, const struct attribute_group *); @@ -157,76 +152,80 @@ void sysfs_printk_last_file(void); #else /* CONFIG_SYSFS */ -static inline int sysfs_create_dir(struct kobject * k) +static inline int sysfs_create_dir(struct kobject *k) { return 0; } -static inline void sysfs_remove_dir(struct kobject * k) +static inline void sysfs_remove_dir(struct kobject *k) { - ; } -static inline int sysfs_rename_dir(struct kobject * k, const char *new_name) +static inline int sysfs_rename_dir(struct kobject *k, const char *new_name) { return 0; } -static inline int sysfs_create_file(struct kobject * k, const struct attribute * a) +static inline int sysfs_create_file(struct kobject *k, + const struct attribute *a) { return 0; } -static inline int sysfs_update_file(struct kobject * k, const struct attribute * a) +static inline int sysfs_update_file(struct kobject *k, + const struct attribute *a) { return 0; } -static inline int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode) + +static inline int sysfs_chmod_file(struct kobject *kobj, + struct attribute *attr, mode_t mode) { return 0; } -static inline void sysfs_remove_file(struct kobject * k, const struct attribute * a) +static inline void sysfs_remove_file(struct kobject *k, + const struct attribute *a) { - ; } -static inline int sysfs_create_link(struct kobject * k, struct kobject * t, const char * n) +static inline int sysfs_create_link(struct kobject *k, struct kobject *t, + const char *n) { return 0; } -static inline void sysfs_remove_link(struct kobject * k, const char * name) +static inline void sysfs_remove_link(struct kobject *k, const char *name) { - ; } -static inline int sysfs_create_bin_file(struct kobject * k, struct bin_attribute * a) +static inline int sysfs_create_bin_file(struct kobject *k, + struct bin_attribute *a) { return 0; } -static inline int sysfs_remove_bin_file(struct kobject * k, struct bin_attribute * a) +static inline int sysfs_remove_bin_file(struct kobject *k, + struct bin_attribute *a) { return 0; } -static inline int sysfs_create_group(struct kobject * k, const struct attribute_group *g) +static inline int sysfs_create_group(struct kobject *k, + const struct attribute_group *g) { return 0; } -static inline void sysfs_remove_group(struct kobject * k, const struct attribute_group * g) +static inline void sysfs_remove_group(struct kobject *k, + const struct attribute_group *g) { - ; } static inline void sysfs_printk_last_file(void) { - ; } #endif /* CONFIG_SYSFS */ - #endif /* _SYSFS_H_ */ _