[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>

2 files changed, 9 insertions, 9 deletions

diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
index e975a76a9d5b..bfb4a7a54e22 100644
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
@@ -26,23 +26,23 @@ static struct subsys_attribute _name##_attr = \
 /* current uevent sequence number */
 static ssize_t uevent_seqnum_show(struct subsystem *subsys, char *page)
 {
-        return sprintf(page, "%llu\n", (unsigned long long)hotplug_seqnum);
+        return sprintf(page, "%llu\n", (unsigned long long)uevent_seqnum);
 }
 KERNEL_ATTR_RO(uevent_seqnum);
 
 /* uevent helper program, used during early boo */
 static ssize_t uevent_helper_show(struct subsystem *subsys, char *page)
 {
-        return sprintf(page, "%s\n", hotplug_path);
+        return sprintf(page, "%s\n", uevent_helper);
 }
 static ssize_t uevent_helper_store(struct subsystem *subsys, const char *page, size_t count)
 {
-        if (count+1 > HOTPLUG_PATH_LEN)
+        if (count+1 > UEVENT_HELPER_PATH_LEN)
                 return -ENOENT;
-        memcpy(hotplug_path, page, count);
-        hotplug_path[count] = '\0';
-        if (count && hotplug_path[count-1] == '\n')
-                hotplug_path[count-1] = '\0';
+        memcpy(uevent_helper, page, count);
+        uevent_helper[count] = '\0';
+        if (count && uevent_helper[count-1] == '\n')
+                uevent_helper[count-1] = '\0';
         return count;
 }
 KERNEL_ATTR_RW(uevent_helper);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 6a51e25d4466..345f4a1d533f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -395,8 +395,8 @@ static ctl_table kern_table[] = {
         {
                 .ctl_name       = KERN_HOTPLUG,
                 .procname       = "hotplug",
-                .data           = &hotplug_path,
-                .maxlen         = HOTPLUG_PATH_LEN,
+                .data           = &uevent_helper,
+                .maxlen         = UEVENT_HELPER_PATH_LEN,
                 .mode           = 0644,
                 .proc_handler   = &proc_dostring,
                 .strategy       = &sysctl_string,