From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762230AbYBSWlX (ORCPT ); Tue, 19 Feb 2008 17:41:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755577AbYBSWlL (ORCPT ); Tue, 19 Feb 2008 17:41:11 -0500 Received: from rgminet01.oracle.com ([148.87.113.118]:25706 "EHLO rgminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754440AbYBSWlJ (ORCPT ); Tue, 19 Feb 2008 17:41:09 -0500 Date: Tue, 19 Feb 2008 14:40:53 -0800 From: Randy Dunlap To: David Rientjes Cc: Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: [PATCH] documentation: fix firmware_sample_firmware_class to build Message-Id: <20080219144053.f0506b87.randy.dunlap@oracle.com> In-Reply-To: References: <20080218162216.ee1501fd.randy.dunlap@oracle.com> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.4.7 (GTK+ 2.8.10; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAQAAAAI= X-Brightmail-Tracker: AAAAAQAAAAI= X-Whitelist: TRUE X-Whitelist: TRUE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Signed-off-by: David Rientjes > --- > 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