diff options
Diffstat (limited to 'drivers/input/input.c')
-rw-r--r-- | drivers/input/input.c | 14 |
1 files changed, 7 insertions, 7 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) | |||
610 | } | 610 | } |
611 | 611 | ||
612 | /* | 612 | /* |
613 | * Input hotplugging interface - loading event handlers based on | 613 | * Input uevent interface - loading event handlers based on |
614 | * device bitfields. | 614 | * device bitfields. |
615 | */ | 615 | */ |
616 | static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index, | 616 | static int input_add_uevent_bm_var(char **envp, int num_envp, int *cur_index, |
617 | char *buffer, int buffer_size, int *cur_len, | 617 | char *buffer, int buffer_size, int *cur_len, |
618 | const char *name, unsigned long *bitmap, int max) | 618 | const char *name, unsigned long *bitmap, int max) |
619 | { | 619 | { |
@@ -638,7 +638,7 @@ static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index, | |||
638 | 638 | ||
639 | #define INPUT_ADD_HOTPLUG_VAR(fmt, val...) \ | 639 | #define INPUT_ADD_HOTPLUG_VAR(fmt, val...) \ |
640 | do { \ | 640 | do { \ |
641 | int err = add_hotplug_env_var(envp, num_envp, &i, \ | 641 | int err = add_uevent_var(envp, num_envp, &i, \ |
642 | buffer, buffer_size, &len, \ | 642 | buffer, buffer_size, &len, \ |
643 | fmt, val); \ | 643 | fmt, val); \ |
644 | if (err) \ | 644 | if (err) \ |
@@ -647,15 +647,15 @@ static int input_add_hotplug_bm_var(char **envp, int num_envp, int *cur_index, | |||
647 | 647 | ||
648 | #define INPUT_ADD_HOTPLUG_BM_VAR(name, bm, max) \ | 648 | #define INPUT_ADD_HOTPLUG_BM_VAR(name, bm, max) \ |
649 | do { \ | 649 | do { \ |
650 | int err = input_add_hotplug_bm_var(envp, num_envp, &i, \ | 650 | int err = input_add_uevent_bm_var(envp, num_envp, &i, \ |
651 | buffer, buffer_size, &len, \ | 651 | buffer, buffer_size, &len, \ |
652 | name, bm, max); \ | 652 | name, bm, max); \ |
653 | if (err) \ | 653 | if (err) \ |
654 | return err; \ | 654 | return err; \ |
655 | } while (0) | 655 | } while (0) |
656 | 656 | ||
657 | static int input_dev_hotplug(struct class_device *cdev, char **envp, | 657 | static int input_dev_uevent(struct class_device *cdev, char **envp, |
658 | int num_envp, char *buffer, int buffer_size) | 658 | int num_envp, char *buffer, int buffer_size) |
659 | { | 659 | { |
660 | struct input_dev *dev = to_input_dev(cdev); | 660 | struct input_dev *dev = to_input_dev(cdev); |
661 | int i = 0; | 661 | int i = 0; |
@@ -697,7 +697,7 @@ static int input_dev_hotplug(struct class_device *cdev, char **envp, | |||
697 | struct class input_class = { | 697 | struct class input_class = { |
698 | .name = "input", | 698 | .name = "input", |
699 | .release = input_dev_release, | 699 | .release = input_dev_release, |
700 | .hotplug = input_dev_hotplug, | 700 | .uevent = input_dev_uevent, |
701 | }; | 701 | }; |
702 | 702 | ||
703 | struct input_dev *input_allocate_device(void) | 703 | struct input_dev *input_allocate_device(void) |