[PATCH] driver core: replace "hotplug" by "uevent"

Leave the overloaded "hotplug" word to susbsystems which are handling
real devices. The driver core does not "plug" anything, it just exports
the state to userspace and generates events.

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

3 files changed, 8 insertions, 8 deletions

diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c
index bd7568ac87..0ed3874038 100644
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
@@ -78,7 +78,7 @@ static struct class_device_attribute *bt_attrs[] = {
 };
 
 #ifdef CONFIG_HOTPLUG
-static int bt_hotplug(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
+static int bt_uevent(struct class_device *cdev, char **envp, int num_envp, char *buf, int size)
 {
         struct hci_dev *hdev = class_get_devdata(cdev);
         int n, i = 0;
@@ -107,7 +107,7 @@ struct class bt_class = {
         .name           = "bluetooth",
         .release        = bt_release,
 #ifdef CONFIG_HOTPLUG
-        .hotplug        = bt_hotplug,
+        .uevent         = bt_uevent,
 #endif
 };
 
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index f6a19d53ea..2ebdc23bbe 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -248,7 +248,7 @@ int br_sysfs_addif(struct net_bridge_port *p)
         if (err)
                 goto out2;
 
-        kobject_hotplug(&p->kobj, KOBJ_ADD);
+        kobject_uevent(&p->kobj, KOBJ_ADD);
         return 0;
  out2:
         kobject_del(&p->kobj);
@@ -260,7 +260,7 @@ void br_sysfs_removeif(struct net_bridge_port *p)
 {
         pr_debug("br_sysfs_removeif\n");
         sysfs_remove_link(&p->br->ifobj, p->dev->name);
-        kobject_hotplug(&p->kobj, KOBJ_REMOVE);
+        kobject_uevent(&p->kobj, KOBJ_REMOVE);
         kobject_del(&p->kobj);
 }
 
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index e2137f3e48..198655dd9a 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -369,14 +369,14 @@ static struct attribute_group wireless_group = {
 #endif
 
 #ifdef CONFIG_HOTPLUG
-static int netdev_hotplug(struct class_device *cd, char **envp,
-                          int num_envp, char *buf, int size)
+static int netdev_uevent(struct class_device *cd, char **envp,
+                         int num_envp, char *buf, int size)
 {
         struct net_device *dev = to_net_dev(cd);
         int i = 0;
         int n;
 
-        /* pass interface in env to hotplug. */
+        /* pass interface to uevent. */
         envp[i++] = buf;
         n = snprintf(buf, size, "INTERFACE=%s", dev->name) + 1;
         buf += n;
@@ -408,7 +408,7 @@ static struct class net_class = {
         .name = "net",
         .release = netdev_release,
 #ifdef CONFIG_HOTPLUG
-        .hotplug = netdev_hotplug,
+        .uevent = netdev_uevent,
 #endif
 };