From ecae28bb95ed093130c9be866ba1f21aaa3cc1ae Mon Sep 17 00:00:00 2001
From: Denis Cheng <crquan@gmail.com>
Date: Thu, 6 Dec 2007 02:24:40 +0800
Subject: [PATCH] --- yaml --- r: 75869 b: refs/heads/master c:
 db1118a460c7bfd20278955cbf56c0b283a9701f h: refs/heads/master i:   75867:
 1f79852ff2c94d8b19aabdd713293a49cdd60a0b v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/base/attribute_container.c | 9 +--------
 trunk/drivers/base/base.h                | 1 -
 trunk/drivers/base/init.c                | 1 -
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index fc983cacf30b..54cf6cd878dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44bfe16e1083d66f97a5289e359c52ee2c8b19a7
+refs/heads/master: db1118a460c7bfd20278955cbf56c0b283a9701f
diff --git a/trunk/drivers/base/attribute_container.c b/trunk/drivers/base/attribute_container.c
index 7370d7cf5988..d4dfb97de3b0 100644
--- a/trunk/drivers/base/attribute_container.c
+++ b/trunk/drivers/base/attribute_container.c
@@ -61,7 +61,7 @@ attribute_container_classdev_to_container(struct class_device *classdev)
 }
 EXPORT_SYMBOL_GPL(attribute_container_classdev_to_container);
 
-static struct list_head attribute_container_list;
+static LIST_HEAD(attribute_container_list);
 
 static DEFINE_MUTEX(attribute_container_mutex);
 
@@ -429,10 +429,3 @@ attribute_container_find_class_device(struct attribute_container *cont,
 	return cdev;
 }
 EXPORT_SYMBOL_GPL(attribute_container_find_class_device);
-
-int __init
-attribute_container_init(void)
-{
-	INIT_LIST_HEAD(&attribute_container_list);
-	return 0;
-}
diff --git a/trunk/drivers/base/base.h b/trunk/drivers/base/base.h
index 3b0f395552db..a74ceda34e19 100644
--- a/trunk/drivers/base/base.h
+++ b/trunk/drivers/base/base.h
@@ -49,7 +49,6 @@ static inline int hypervisor_init(void) { return 0; }
 extern int platform_bus_init(void);
 extern int system_bus_init(void);
 extern int cpu_dev_init(void);
-extern int attribute_container_init(void);
 
 extern int bus_add_device(struct device * dev);
 extern void bus_attach_device(struct device * dev);
diff --git a/trunk/drivers/base/init.c b/trunk/drivers/base/init.c
index 37138154f9e8..1da88a10cfec 100644
--- a/trunk/drivers/base/init.c
+++ b/trunk/drivers/base/init.c
@@ -36,5 +36,4 @@ void __init driver_init(void)
 	system_bus_init();
 	cpu_dev_init();
 	memory_dev_init();
-	attribute_container_init();
 }