Driver core: make device_is_registered() work for class devices

device_is_registered() can use the kobject value for this, so it will
now work with devices that are associated with only a class, not a bus
and a driver.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 2d207ad30336..450942acca1a 100644
--- a/drivers/base/bus.c
+++ b/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);