diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-23 02:28:57 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 03:03:39 -0500 |
| commit | 58b45d166f4c16d21f6aa059c6c5d87a9eeb1ff5 (patch) | |
| tree | 63bb36cd68ba9438de78b7201c9c0122b14e2420 /drivers/input | |
| parent | 5e7fe820fa1fdf1988e71c0c1070b5d9bdd4fcf1 (diff) | |
Input: serio - remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's
always on now in preparation of it going away as an option.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/serio.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index d0f7533dbf88..25fc5971f426 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c | |||
| @@ -891,8 +891,6 @@ static int serio_bus_match(struct device *dev, struct device_driver *drv) | |||
| 891 | return serio_match_port(serio_drv->id_table, serio); | 891 | return serio_match_port(serio_drv->id_table, serio); |
| 892 | } | 892 | } |
| 893 | 893 | ||
| 894 | #ifdef CONFIG_HOTPLUG | ||
| 895 | |||
| 896 | #define SERIO_ADD_UEVENT_VAR(fmt, val...) \ | 894 | #define SERIO_ADD_UEVENT_VAR(fmt, val...) \ |
| 897 | do { \ | 895 | do { \ |
| 898 | int err = add_uevent_var(env, fmt, val); \ | 896 | int err = add_uevent_var(env, fmt, val); \ |
| @@ -920,15 +918,6 @@ static int serio_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
| 920 | } | 918 | } |
| 921 | #undef SERIO_ADD_UEVENT_VAR | 919 | #undef SERIO_ADD_UEVENT_VAR |
| 922 | 920 | ||
| 923 | #else | ||
| 924 | |||
| 925 | static int serio_uevent(struct device *dev, struct kobj_uevent_env *env) | ||
| 926 | { | ||
| 927 | return -ENODEV; | ||
| 928 | } | ||
| 929 | |||
| 930 | #endif /* CONFIG_HOTPLUG */ | ||
| 931 | |||
| 932 | #ifdef CONFIG_PM | 921 | #ifdef CONFIG_PM |
| 933 | static int serio_suspend(struct device *dev) | 922 | static int serio_suspend(struct device *dev) |
| 934 | { | 923 | { |
