Re: [PATCH] documentation: fix firmware_sample_firmware_class to build

[Randy Dunlap <randy.dunlap@oracle.com>]

On Mon, 18 Feb 2008 16:51:31 -0800 (PST) David Rientjes wrote:

> Change sysfs_remove_bin_file() to have a return value of void in the 
> !CONFIG_SYSFS case, matching the return value of the same function with 
> the opposite configuration.
> 
> Also moves unnecessary ';' in empty void functions.
> 
> Cc: Randy Dunlap <randy.dunlap@oracle.com>
> Signed-off-by: David Rientjes <rientjes@google.com>
> ---
>  include/linux/sysfs.h |   11 +++--------
>  1 files changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
> --- a/include/linux/sysfs.h
> +++ b/include/linux/sysfs.h
> @@ -93,7 +93,7 @@ int __must_check sysfs_create_file(struct kobject *kobj,
>  				   const struct attribute *attr);
>  int __must_check sysfs_chmod_file(struct kobject *kobj, struct attribute *attr,
>  				  mode_t mode);
> -void sysfs_remove_file(struct kobject *kobj, const struct attribute *attr);
> +void wsysfs_remove_file(struct kobject *kobj, const struct attribute *attr);

Please explain the change above.  I don't get it...

>  
>  int __must_check sysfs_create_bin_file(struct kobject *kobj,
>  				       struct bin_attribute *attr);
> @@ -131,7 +131,6 @@ static inline int sysfs_create_dir(struct kobject *kobj)
>  
>  static inline void sysfs_remove_dir(struct kobject *kobj)
>  {
> -	;
>  }
>  
>  static inline int sysfs_rename_dir(struct kobject *kobj, const char *new_name)
> @@ -160,7 +159,6 @@ static inline int sysfs_chmod_file(struct kobject *kobj,
>  static inline void sysfs_remove_file(struct kobject *kobj,
>  				     const struct attribute *attr)
>  {
> -	;
>  }
>  
>  static inline int sysfs_create_bin_file(struct kobject *kobj,
> @@ -169,10 +167,9 @@ static inline int sysfs_create_bin_file(struct kobject *kobj,
>  	return 0;
>  }
>  
> -static inline int sysfs_remove_bin_file(struct kobject *kobj,
> -					struct bin_attribute *attr)
> +static inline void sysfs_remove_bin_file(struct kobject *kobj,
> +					 struct bin_attribute *attr)
>  {
> -	return 0;
>  }
>  
>  static inline int sysfs_create_link(struct kobject *kobj,
> @@ -183,7 +180,6 @@ static inline int sysfs_create_link(struct kobject *kobj,
>  
>  static inline void sysfs_remove_link(struct kobject *kobj, const char *name)
>  {
> -	;
>  }
>  
>  static inline int sysfs_create_group(struct kobject *kobj,
> @@ -195,7 +191,6 @@ static inline int sysfs_create_group(struct kobject *kobj,
>  static inline void sysfs_remove_group(struct kobject *kobj,
>  				      const struct attribute_group *grp)
>  {
> -	;
>  }
>  
>  static inline int sysfs_add_file_to_group(struct kobject *kobj,


---
~Randy