Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Revert "Driver core: let request_module() send a /sys/modules/kmod/-uevent"
  Driver core: fix error by cleanup up symlinks properly
  make kernel/kmod.c:kmod_mk static
  power management: fix struct layout and docs
  power management: no valid states w/o pm_ops
  Driver core: more fallout from class_device changes for pcmcia
  sysfs: move struct sysfs_dirent to private header
  driver core: refcounting fix
  Driver core: remove class_device_rename

8 files changed, 36 insertions, 49 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 1417e5cd4c6f..d5968128be2b 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -840,48 +840,6 @@ void class_device_destroy(struct class *cls, dev_t devt)
                 class_device_unregister(class_dev);
 }
 
-int class_device_rename(struct class_device *class_dev, char *new_name)
-{
-        int error = 0;
-        char *old_class_name = NULL, *new_class_name = NULL;
-
-        class_dev = class_device_get(class_dev);
-        if (!class_dev)
-                return -EINVAL;
-
-        pr_debug("CLASS: renaming '%s' to '%s'\n", class_dev->class_id,
-                 new_name);
-
-#ifdef CONFIG_SYSFS_DEPRECATED
-        if (class_dev->dev)
-                old_class_name = make_class_name(class_dev->class->name,
-                                                 &class_dev->kobj);
-#endif
-
-        strlcpy(class_dev->class_id, new_name, KOBJ_NAME_LEN);
-
-        error = kobject_rename(&class_dev->kobj, new_name);
-
-#ifdef CONFIG_SYSFS_DEPRECATED
-        if (class_dev->dev) {
-                new_class_name = make_class_name(class_dev->class->name,
-                                                 &class_dev->kobj);
-                if (new_class_name)
-                        sysfs_create_link(&class_dev->dev->kobj,
-                                          &class_dev->kobj, new_class_name);
-                if (old_class_name)
-                        sysfs_remove_link(&class_dev->dev->kobj,
-                                                old_class_name);
-        }
-#endif
-        class_device_put(class_dev);
-
-        kfree(old_class_name);
-        kfree(new_class_name);
-
-        return error;
-}
-
 struct class_device * class_device_get(struct class_device *class_dev)
 {
         if (class_dev)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index d04fd33dcd91..cf2a398aaaa1 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -637,12 +637,41 @@ int device_add(struct device *dev)
                                              BUS_NOTIFY_DEL_DEVICE, dev);
         device_remove_groups(dev);
  GroupError:
-        device_remove_attrs(dev);
+        device_remove_attrs(dev);
  AttrsError:
         if (dev->devt_attr) {
                 device_remove_file(dev, dev->devt_attr);
                 kfree(dev->devt_attr);
         }
+
+        if (dev->class) {
+                sysfs_remove_link(&dev->kobj, "subsystem");
+                /* If this is not a "fake" compatible device, remove the
+                 * symlink from the class to the device. */
+                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
+                        sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                                          dev->bus_id);
+#ifdef CONFIG_SYSFS_DEPRECATED
+                if (parent) {
+                        char *class_name = make_class_name(dev->class->name,
+                                                           &dev->kobj);
+                        if (class_name)
+                                sysfs_remove_link(&dev->parent->kobj,
+                                                  class_name);
+                        kfree(class_name);
+                        sysfs_remove_link(&dev->kobj, "device");
+                }
+#endif
+
+                down(&dev->class->sem);
+                /* notify any interfaces that the device is now gone */
+                list_for_each_entry(class_intf, &dev->class->interfaces, node)
+                        if (class_intf->remove_dev)
+                                class_intf->remove_dev(dev, class_intf);
+                /* remove the device from the class list */
+                list_del_init(&dev->node);
+                up(&dev->class->sem);
+        }
  ueventattrError:
         device_remove_file(dev, &dev->uevent_attr);
  attrError:
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
index caca0dc9d30f..f2e810f53c81 100644
--- a/drivers/pcmcia/hd64465_ss.c
+++ b/drivers/pcmcia/hd64465_ss.c
@@ -907,7 +907,7 @@ static int __init init_hs(void)
 
         for (i=0; i<HS_MAX_SOCKETS; i++) {
                 unsigned int ret;
-                hs_sockets[i].socket.dev.dev = &hd64465_device.dev;             
+                hs_sockets[i].socket.dev.parent = &hd64465_device.dev;
                 hs_sockets[i].number = i;
                 ret = pcmcia_register_socket(&hs_sockets[i].socket);
                 if (ret && i)
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c
index e4a94108aab9..91da15b5a81e 100644
--- a/drivers/pcmcia/m32r_cfc.c
+++ b/drivers/pcmcia/m32r_cfc.c
@@ -760,7 +760,7 @@ static int __init init_m32r_pcc(void)
         /* Set up interrupt handler(s) */
 
         for (i = 0 ; i < pcc_sockets ; i++) {
-                socket[i].socket.dev.dev = &pcc_device.dev;
+                socket[i].socket.dev.parent = &pcc_device.dev;
                 socket[i].socket.ops = &pcc_operations;
                 socket[i].socket.resource_ops = &pccard_nonstatic_ops;
                 socket[i].socket.owner = THIS_MODULE;
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index d059c9196172..9721ed7bf502 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1321,7 +1321,7 @@ static int __init m8xx_init(void)
                 socket[i].socket.ops = &m8xx_services;
                 socket[i].socket.resource_ops = &pccard_iodyn_ops;
                 socket[i].socket.cb_dev = NULL;
-                socket[i].socket.dev.dev = &m8xx_device.dev;
+                socket[i].socket.dev.parent = &m8xx_device.dev;
         }
 
         for (i = 0; i < PCMCIA_SOCKETS_NO; i++)
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 76f7cbc62a8b..d77f75129f8a 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -291,7 +291,7 @@ static int __devinit omap_cf_probe(struct device *dev)
                 omap_cf_present() ? "present" : "(not present)");
 
         cf->socket.owner = THIS_MODULE;
-        cf->socket.dev.dev = dev;
+        cf->socket.dev.parent = dev;
         cf->socket.ops = &omap_cf_ops;
         cf->socket.resource_ops = &pccard_static_ops;
         cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 81dfc2cac2b4..ce2226273aaa 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -232,7 +232,7 @@ static struct resource *iodyn_find_io_region(unsigned long base, int num,
                 unsigned long align, struct pcmcia_socket *s)
 {
         struct resource *res = make_resource(0, num, IORESOURCE_IO,
-                                             s->dev.class_id);
+                                             s->dev.bus_id);
         struct pcmcia_align_data data;
         unsigned long min = base;
         int ret;
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index 206e26c91807..eee2f1cb213c 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -596,7 +596,7 @@ static int __devinit vrc4171_add_sockets(void)
                 }
 
                 sprintf(socket->name, "NEC VRC4171 Card Slot %1c", 'A' + slot);
-                socket->pcmcia_socket.dev.dev = &vrc4171_card_device.dev;
+                socket->pcmcia_socket.dev.parent = &vrc4171_card_device.dev;
                 socket->pcmcia_socket.ops = &vrc4171_pccard_operations;
                 socket->pcmcia_socket.owner = THIS_MODULE;