From a1b5987e9f60d2646c3412bb565b7df7af45f07f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 13 Mar 2008 17:07:03 -0400
Subject: [PATCH] --- yaml --- r: 91402 b: refs/heads/master c:
 3f62e5700b2a679ae987b32a68126dd6dcf2488f h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/base/bus.c     | 9 ++-------
 trunk/include/linux/device.h | 3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 6040169596fb..a065230ce4ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a3df1f7de0ecaf77a1dde86f2a4dc020f37f87e
+refs/heads/master: 3f62e5700b2a679ae987b32a68126dd6dcf2488f
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 2d207ad30336..450942acca1a 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -505,14 +505,11 @@ void bus_attach_device(struct device *dev)
 	int ret = 0;
 
 	if (bus) {
-		dev->is_registered = 1;
 		if (bus->p->drivers_autoprobe)
 			ret = device_attach(dev);
 		WARN_ON(ret < 0);
 		if (ret >= 0)
 			klist_add_tail(&dev->knode_bus, &bus->p->klist_devices);
-		else
-			dev->is_registered = 0;
 	}
 }
 
@@ -533,10 +530,8 @@ void bus_remove_device(struct device *dev)
 		sysfs_remove_link(&dev->bus->p->devices_kset->kobj,
 				  dev->bus_id);
 		device_remove_attrs(dev->bus, dev);
-		if (dev->is_registered) {
-			dev->is_registered = 0;
-			klist_del(&dev->knode_bus);
-		}
+		klist_del(&dev->knode_bus);
+
 		pr_debug("bus: '%s': remove device %s\n",
 			 dev->bus->name, dev->bus_id);
 		device_release_driver(dev);
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index d7a1ae063b65..441461f5ee20 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -429,7 +429,6 @@ struct device {
 	struct kobject kobj;
 	char	bus_id[BUS_ID_SIZE];	/* position on parent bus */
 	struct device_type	*type;
-	unsigned		is_registered:1;
 	unsigned		uevent_suppress:1;
 
 	struct semaphore	sem;	/* semaphore to synchronize calls to
@@ -509,7 +508,7 @@ static inline void dev_set_drvdata(struct device *dev, void *data)
 
 static inline int device_is_registered(struct device *dev)
 {
-	return dev->is_registered;
+	return dev->kobj.state_in_sysfs;
 }
 
 void driver_init(void);