[PATCH] sysfs: Remove CPP abuse

[PATCH] sysfs: Remove CPP abuse

[Peter Zijlstra]

There's absolutely no reason to abuse CPP to shorten a common sub
expression, C has variables for this.


Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
 fs/sysfs/dir.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 7fdf6a7..80fb6e6 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -576,8 +576,11 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
 	}
 
 	while (p) {
+		struct sysfs_dirent *node;
 		int c;
-#define node	rb_entry(p, struct sysfs_dirent, name_node)
+	       
+		node = rb_entry(p, struct sysfs_dirent, name_node);
+
 		c = strcmp(name, node->s_name);
 		if (c < 0) {
 			p = node->name_node.rb_left;
@@ -587,7 +590,6 @@ struct sysfs_dirent *sysfs_find_dirent(struct sysfs_dirent *parent_sd,
 			found = node;
 			p = node->name_node.rb_left;
 		}
-#undef node
 	}
 
 	if (found) {

Re: [PATCH] sysfs: Remove CPP abuse

[Greg KH]

On Tue, Feb 14, 2012 at 05:36:07PM +0100, Peter Zijlstra wrote:
> There's absolutely no reason to abuse CPP to shorten a common sub
> expression, C has variables for this.
> 
> 
> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
> ---
>  fs/sysfs/dir.c |    6 ++++--

This is all fixed up already in linux-next, thanks though.

greg k-h