HID: remove compat stuff
Subsystems (2)
PATCH 1/1 HID: remove compat stuff
This removal was scheduled and there is no problem with later distros to adapt for the new bus, thanks to aliases.
module-init-tools map files are deprecated nowadays, so that the patch which introduced hid ones into the m-i-t won't be accepted and hence there is no reason for leaving compat stuff in.
--- Documentation/feature-removal-schedule.txt | 7 -- drivers/hid/Kconfig | 12 ---- drivers/hid/Makefile | 4 - drivers/hid/hid-a4tech.c | 2 - drivers/hid/hid-apple.c | 2 - drivers/hid/hid-belkin.c | 2 - drivers/hid/hid-cherry.c | 2 - drivers/hid/hid-chicony.c | 2 - drivers/hid/hid-core.c | 4 - drivers/hid/hid-cypress.c | 2 - drivers/hid/hid-drff.c | 2 - drivers/hid/hid-dummy.c | 87 ---------------------------- drivers/hid/hid-ezkey.c | 2 - drivers/hid/hid-gaff.c | 2 - drivers/hid/hid-gyration.c | 2 - drivers/hid/hid-kensington.c | 2 - drivers/hid/hid-kye.c | 2 - drivers/hid/hid-lg.c | 2 - drivers/hid/hid-microsoft.c | 2 - drivers/hid/hid-monterey.c | 2 - drivers/hid/hid-ntrig.c | 2 - drivers/hid/hid-petalynx.c | 2 - drivers/hid/hid-pl.c | 2 - drivers/hid/hid-samsung.c | 2 - drivers/hid/hid-sony.c | 2 - drivers/hid/hid-sunplus.c | 2 - drivers/hid/hid-tmff.c | 2 - drivers/hid/hid-topseed.c | 2 - drivers/hid/hid-zpff.c | 2 - include/linux/hid.h | 16 ----- 30 files changed, 0 insertions(+), 178 deletions(-) delete mode 100644 drivers/hid/hid-dummy.c
Documentation/feature-removal-schedule.txt +0 -7
@@ -264,13 +264,6 @@ Who: Glauber Costa <[email protected]> --------------------------- -What: remove HID compat support -When: 2.6.29 -Why: needed only as a temporary solution until distros fix themselves up -Who: Jiri Slaby <[email protected]> - ---------------------------- - What: print_fn_descriptor_symbol() When: October 2009 Why: The %pF vsprintf format provides the same functionality in a
drivers/hid/Kconfig +0 -12
@@ -70,18 +70,6 @@ source "drivers/hid/usbhid/Kconfig" menu "Special HID drivers" depends on HID -config HID_COMPAT - bool "Load all HID drivers on hid core load" - default y - ---help--- - Compatible option for older userspace. If you have system without udev - support of module loading through aliases and also old - module-init-tools which can't handle hid bus, choose Y here. Otherwise - say N. If you say N and your userspace is old enough, the only - functionality you lose is modules autoloading. - - If unsure, say Y. - config HID_A4TECH tristate "A4 tech" if EMBEDDED depends on USB_HID
drivers/hid/Makefile +0 -4
@@ -8,10 +8,6 @@ obj-$(CONFIG_HID) += hid.o hid-$(CONFIG_HID_DEBUG) += hid-debug.o hid-$(CONFIG_HIDRAW) += hidraw.o -ifdef CONFIG_HID_COMPAT -obj-m += hid-dummy.o -endif - hid-logitech-objs := hid-lg.o ifdef CONFIG_LOGITECH_FF hid-logitech-objs += hid-lgff.o
drivers/hid/hid-a4tech.c +0 -2
@@ -158,5 +158,3 @@ static void a4_exit(void)module_init (a4_init);module_exit (a4_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (a4tech);
drivers/hid/hid-apple.c +0 -2
@@ -474,5 +474,3 @@ static void apple_exit(void)module_init (apple_init);module_exit (apple_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (apple);
drivers/hid/hid-belkin.c +0 -2
@@ -101,5 +101,3 @@ static void belkin_exit(void)module_init (belkin_init);module_exit (belkin_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (belkin);
drivers/hid/hid-cherry.c +0 -2
@@ -83,5 +83,3 @@ static void ch_exit(void)module_init (ch_init);module_exit (ch_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (cherry);
drivers/hid/hid-chicony.c +0 -2
@@ -76,5 +76,3 @@ static void ch_exit(void)module_init (ch_init);module_exit (ch_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (chicony);
drivers/hid/hid-core.c +0 -4
@@ -1849,10 +1849,6 @@ static int __init hid_init(void)if (ret) goto err_bus; -#ifdef CONFIG_HID_COMPAT -request_module_nowait ("hid-dummy" ); -#endif -return 0 ; err_bus:bus_unregister (&hid_bus_type);
drivers/hid/hid-cypress.c +0 -2
@@ -154,5 +154,3 @@ static void cp_exit(void)module_init (cp_init);module_exit (cp_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (cypress);
drivers/hid/hid-drff.c +0 -2
@@ -186,5 +186,3 @@ static void __exit dr_exit(void)module_init (dr_init);module_exit (dr_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (dragonrise);
drivers/hid/hid-dummy.c deleted +0 -87
87 lines not on this page · raw message
drivers/hid/hid-ezkey.c +0 -2
@@ -91,5 +91,3 @@ static void ez_exit(void)module_init (ez_init);module_exit (ez_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (ezkey);
drivers/hid/hid-gaff.c +0 -2
@@ -181,5 +181,3 @@ static void __exit ga_exit(void)module_init (ga_init);module_exit (ga_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (greenasia);
drivers/hid/hid-gyration.c +0 -2
@@ -94,5 +94,3 @@ static void gyration_exit(void)module_init (gyration_init);module_exit (gyration_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (gyration);
drivers/hid/hid-kensington.c +0 -2
@@ -61,5 +61,3 @@ static void ks_exit(void)module_init (ks_init);module_exit (ks_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (kensington);
drivers/hid/hid-kye.c +0 -2
@@ -67,5 +67,3 @@ static void kye_exit(void)module_init (kye_init);module_exit (kye_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (kye);
drivers/hid/hid-lg.c +0 -2
@@ -326,5 +326,3 @@ static void lg_exit(void)module_init (lg_init);module_exit (lg_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (logitech);
drivers/hid/hid-microsoft.c +0 -2
@@ -210,5 +210,3 @@ static void ms_exit(void)module_init (ms_init);module_exit (ms_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (microsoft);
drivers/hid/hid-monterey.c +0 -2
@@ -78,5 +78,3 @@ static void mr_exit(void)module_init (mr_init);module_exit (mr_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (monterey);
drivers/hid/hid-ntrig.c +0 -2
@@ -78,5 +78,3 @@ static void ntrig_exit(void)module_init (ntrig_init);module_exit (ntrig_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (ntrig);
drivers/hid/hid-petalynx.c +0 -2
@@ -118,5 +118,3 @@ static void pl_exit(void)module_init (pl_init);module_exit (pl_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (petalynx);
drivers/hid/hid-pl.c +0 -2
@@ -230,5 +230,3 @@ static void pl_exit(void)module_init (pl_init);module_exit (pl_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (pantherlord);
drivers/hid/hid-samsung.c +0 -2
@@ -96,5 +96,3 @@ static void samsung_exit(void)module_init (samsung_init);module_exit (samsung_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (samsung);
drivers/hid/hid-sony.c +0 -2
@@ -148,5 +148,3 @@ static void sony_exit(void)module_init (sony_init);module_exit (sony_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (sony);
drivers/hid/hid-sunplus.c +0 -2
@@ -78,5 +78,3 @@ static void sp_exit(void)module_init (sp_init);module_exit (sp_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (sunplus);
drivers/hid/hid-tmff.c +0 -2
@@ -265,5 +265,3 @@ static void tm_exit(void)module_init (tm_init);module_exit (tm_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (thrustmaster);
drivers/hid/hid-topseed.c +0 -2
@@ -73,5 +73,3 @@ static void ts_exit(void)module_init (ts_init);module_exit (ts_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (topseed);
drivers/hid/hid-zpff.c +0 -2
@@ -158,5 +158,3 @@ static void zp_exit(void)module_init (zp_init);module_exit (zp_exit);MODULE_LICENSE ("GPL" ); - -HID_COMPAT_LOAD_DRIVER (zeroplus);
include/linux/hid.h +0 -16
@@ -798,21 +798,5 @@ dbg_hid(const char *fmt, ...) __FILE__ , ## arg)#endif /* HID_FF */ -#ifdef __KERNEL__ -#ifdef CONFIG_HID_COMPAT -#define HID_COMPAT_LOAD_DRIVER (name) \ -/* prototype to avoid sparse warning */ \ -extern void hid_compat_##name(void); \ -void hid_compat_##name(void) { } \ -EXPORT_SYMBOL(hid_compat_##name) -#else -#define HID_COMPAT_LOAD_DRIVER (name) -#endif /* HID_COMPAT */ -#define HID_COMPAT_CALL_DRIVER (name) do { \ - extern void hid_compat_##name(void); \ - hid_compat_##name(); \ -} while (0) -#endif /* __KERNEL__ */ -#endif
Signature · 1 line
1.6.2
Quoted 9 lines · Jiri Slaby
This removal was scheduled and there is no problem with later distros to adapt for the new bus, thanks to aliases.
module-init-tools map files are deprecated nowadays, so that the patch which introduced hid ones into the m-i-t won't be accepted and hence there is no reason for leaving compat stuff in.
Signed-off-by Jiri Slaby <[email protected]>Cc Jiri Kosina <[email protected]>
This seems to be against some different codebase than what I currently have in my tree. I have manually fixed the patch and applied it to upstream-compat-remove branch, please check it whether it is OK by you.
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
Quoted 9 lines · Jiri Kosina
Quoted 7 lines · Jiri Slaby
This removal was scheduled and there is no problem with later distros to adapt for the new bus, thanks to aliases.
module-init-tools map files are deprecated nowadays, so that the patch which introduced hid ones into the m-i-t won't be accepted and hence there is no reason for leaving compat stuff in.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Jiri Slaby<[email protected]>Cc Jiri Kosina<[email protected]>This seems to be against some different codebase than what I currently have in my tree. I have manually fixed the patch and applied it to upstream-compat-remove branch, please check it whether it is OK by you.
Looks good(tm). Thanks.
It was based on an -mm kernel, which contains -next's request_module_nowait. Sorry for that.