[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, 18 insertions, 18 deletions

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 43b49ccd7dad..2d37b394e384 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -610,10 +610,10 @@ static void input_dev_release(struct class_device *class_dev)
 }
 
 /*
- * Input hotplugging interface - loading event handlers based on
+ * Input uevent interface - loading event handlers based on
  * device bitfields.
  */
-static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index,
+static int input_add_uevent_bm_var(char **envp, int num_envp, int *cur_index,
                                     char *buffer, int buffer_size, int *cur_len,
                                     const char *name, unsigned long *bitmap, int max)
 {
@@ -638,7 +638,7 @@ static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index,
 
 #define INPUT_ADD_HOTPLUG_VAR(fmt, val...)                              \
         do {                                                            \
-                int err = add_hotplug_env_var(envp, num_envp, &i,       \
+                int err = add_uevent_var(envp, num_envp, &i,    \
                                         buffer, buffer_size, &len,      \
                                         fmt, val);                      \
                 if (err)                                                \
@@ -647,15 +647,15 @@ static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index,
 
 #define INPUT_ADD_HOTPLUG_BM_VAR(name, bm, max)                         \
         do {                                                            \
-                int err = input_add_hotplug_bm_var(envp, num_envp, &i,  \
+                int err = input_add_uevent_bm_var(envp, num_envp, &i,   \
                                         buffer, buffer_size, &len,      \
                                         name, bm, max);                 \
                 if (err)                                                \
                         return err;                                     \
         } while (0)
 
-static int input_dev_hotplug(struct class_device *cdev, char **envp,
-                             int num_envp, char *buffer, int buffer_size)
+static int input_dev_uevent(struct class_device *cdev, char **envp,
+                            int num_envp, char *buffer, int buffer_size)
 {
         struct input_dev *dev = to_input_dev(cdev);
         int i = 0;
@@ -697,7 +697,7 @@ static int input_dev_hotplug(struct class_device *cdev, char **envp,
 struct class input_class = {
         .name                   = "input",
         .release                = input_dev_release,
-        .hotplug                = input_dev_hotplug,
+        .uevent                 = input_dev_uevent,
 };
 
 struct input_dev *input_allocate_device(void)
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index fbb69ef6a77b..8e530cc970e1 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -800,16 +800,16 @@ static int serio_bus_match(struct device *dev, struct device_driver *drv)
 
 #ifdef CONFIG_HOTPLUG
 
-#define SERIO_ADD_HOTPLUG_VAR(fmt, val...)                              \
+#define SERIO_ADD_UEVENT_VAR(fmt, val...)                               \
         do {                                                            \
-                int err = add_hotplug_env_var(envp, num_envp, &i,       \
+                int err = add_uevent_var(envp, num_envp, &i,    \
                                         buffer, buffer_size, &len,      \
                                         fmt, val);                      \
                 if (err)                                                \
                         return err;                                     \
         } while (0)
 
-static int serio_hotplug(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int serio_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
 {
         struct serio *serio;
         int i = 0;
@@ -820,21 +820,21 @@ static int serio_hotplug(struct device *dev, char **envp, int num_envp, char *bu
 
         serio = to_serio_port(dev);
 
-        SERIO_ADD_HOTPLUG_VAR("SERIO_TYPE=%02x", serio->id.type);
-        SERIO_ADD_HOTPLUG_VAR("SERIO_PROTO=%02x", serio->id.proto);
-        SERIO_ADD_HOTPLUG_VAR("SERIO_ID=%02x", serio->id.id);
-        SERIO_ADD_HOTPLUG_VAR("SERIO_EXTRA=%02x", serio->id.extra);
-        SERIO_ADD_HOTPLUG_VAR("MODALIAS=serio:ty%02Xpr%02Xid%02Xex%02X",
+        SERIO_ADD_UEVENT_VAR("SERIO_TYPE=%02x", serio->id.type);
+        SERIO_ADD_UEVENT_VAR("SERIO_PROTO=%02x", serio->id.proto);
+        SERIO_ADD_UEVENT_VAR("SERIO_ID=%02x", serio->id.id);
+        SERIO_ADD_UEVENT_VAR("SERIO_EXTRA=%02x", serio->id.extra);
+        SERIO_ADD_UEVENT_VAR("MODALIAS=serio:ty%02Xpr%02Xid%02Xex%02X",
                                 serio->id.type, serio->id.proto, serio->id.id, serio->id.extra);
         envp[i] = NULL;
 
         return 0;
 }
-#undef SERIO_ADD_HOTPLUG_VAR
+#undef SERIO_ADD_UEVENT_VAR
 
 #else
 
-static int serio_hotplug(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int serio_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
 {
         return -ENODEV;
 }
@@ -908,7 +908,7 @@ static int __init serio_init(void)
         serio_bus.dev_attrs = serio_device_attrs;
         serio_bus.drv_attrs = serio_driver_attrs;
         serio_bus.match = serio_bus_match;
-        serio_bus.hotplug = serio_hotplug;
+        serio_bus.uevent = serio_uevent;
         serio_bus.resume = serio_resume;
         bus_register(&serio_bus);