Commit dd5d81f3 authored Sep 23, 2009 by Renzo Davoli Committed by Linus Torvalds Sep 24, 2009

fs/char_dev.c: remove useless loop



There are two useless lines in fs/char_dev.c.

In register_chrdev there is a loop to change all '/' into '!' in the
kernel object name.
This code is useless as the same substitution is in kobject_set_name_vargs in
lib/kobject.c:
228         /* ewww... some of these buggers have '/' in the name ... */
229         while ((s = strchr(kobj->name, '/')))
230                 s[0] = '!';

kobject_set_name_vargs is called by kobject_set_name.
kobject_set_name is called just above the useless loop.

[hidave.darkstar@gmail.com: fix warning, remove the unused char *s]
Signed-off-by: Renzo Davoli <renzo@cs.unibo.it>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent bb521c5d

fs/char_dev.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -264,7 +264,6 @@ int __register_chrdev(unsigned int major, unsigned int baseminor,
		{
		struct char_device_struct *cd;
		struct cdev *cdev;
		char *s;
		int err = -ENOMEM;

		cd = __register_chrdev_region(major, baseminor, count, name);
		@@ -278,8 +277,6 @@ int __register_chrdev(unsigned int major, unsigned int baseminor,
		cdev->owner = fops->owner;
		cdev->ops = fops;
		kobject_set_name(&cdev->kobj, "%s", name);
		for (s = strchr(kobject_name(&cdev->kobj),'/'); s; s = strchr(s, '/'))
		*s = '!';

		err = cdev_add(cdev, MKDEV(cd->major, baseminor), count);
		if (err)

Admin message