From: Jayachandran C. "parent_class" is checked for NULL already, so removed the unnecessary check. Signed-off-by: Jayachandran C. Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/base/class.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff -puN drivers/base/class.c~driver-core-fix-unnecessary-null-check-in-drivers-base-classc drivers/base/class.c --- 25/drivers/base/class.c~driver-core-fix-unnecessary-null-check-in-drivers-base-classc Mon Apr 3 16:47:38 2006 +++ 25-akpm/drivers/base/class.c Mon Apr 3 16:47:38 2006 @@ -562,14 +562,13 @@ int class_device_add(struct class_device kobject_uevent(&class_dev->kobj, KOBJ_ADD); /* notify any interfaces this device is now here */ - if (parent_class) { - down(&parent_class->sem); - list_add_tail(&class_dev->node, &parent_class->children); - list_for_each_entry(class_intf, &parent_class->interfaces, node) - if (class_intf->add) - class_intf->add(class_dev, class_intf); - up(&parent_class->sem); + down(&parent_class->sem); + list_add_tail(&class_dev->node, &parent_class->children); + list_for_each_entry(class_intf, &parent_class->interfaces, node) { + if (class_intf->add) + class_intf->add(class_dev, class_intf); } + up(&parent_class->sem); register_done: if (error) { _