summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Viro <viro@www.linux.org.uk>2004-07-26 06:59:48 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-26 06:59:48 -0700
commita72d313f2db0d7adeeead1979a3875e366d6ccb9 (patch)
tree166296a89b891b38c38ddbb5f828c3d7dafa1498
parentf4163e8a631b5f4db316dde21cdddf682ee65cfb (diff)
[PATCH] more NULL noise removal in fs/*
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/jffs/jffs_proc.c12
-rw-r--r--fs/proc/proc_devtree.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/jffs/jffs_proc.c b/fs/jffs/jffs_proc.c
index 0262c93ef871..9bdd99a557c2 100644
--- a/fs/jffs/jffs_proc.c
+++ b/fs/jffs/jffs_proc.c
@@ -68,9 +68,9 @@ static int jffs_proc_layout_read (char *page, char **start, off_t off,
int jffs_register_jffs_proc_dir(int mtd, struct jffs_control *c)
{
struct jffs_partition_dir *part_dir;
- struct proc_dir_entry *part_info = 0;
- struct proc_dir_entry *part_layout = 0;
- struct proc_dir_entry *part_root = 0;
+ struct proc_dir_entry *part_info = NULL;
+ struct proc_dir_entry *part_layout = NULL;
+ struct proc_dir_entry *part_root = NULL;
char name[10];
sprintf(name, "%d", mtd);
@@ -127,7 +127,7 @@ out:
int jffs_unregister_jffs_proc_dir(struct jffs_control *c)
{
struct jffs_partition_dir *part_dir = jffs_part_dirs;
- struct jffs_partition_dir *prev_part_dir = 0;
+ struct jffs_partition_dir *prev_part_dir = NULL;
while (part_dir) {
if (part_dir->c == c) {
@@ -209,8 +209,8 @@ static int jffs_proc_layout_read (char *page, char **start, off_t off,
int count, int *eof, void *data)
{
struct jffs_control *c = (struct jffs_control *) data;
- struct jffs_fm *fm = 0;
- struct jffs_fm *last_fm = 0;
+ struct jffs_fm *fm = NULL;
+ struct jffs_fm *last_fm = NULL;
int len = 0;
/* Get the first item in the list */
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 5d73364f799a..67423c696c0a 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -88,7 +88,7 @@ void proc_device_tree_add_node(struct device_node *np, struct proc_dir_entry *de
child = NULL;
while ((child = of_get_next_child(np, child))) {
p = strrchr(child->full_name, '/');
- if (p == 0)
+ if (!p)
p = child->full_name;
else
++p;