Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit afa5eb7c68689ced4284f01c96feed44a2d0a127

Authored by Jiri Slaby
Committed by Jiri Kosina
1 parent b2ddd54e19
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 30 changed files with 0 additions and 195 deletions Side-by-side Diff

Documentation/feature-removal-schedule.txt
Diff comments   View file @ afa5eb7
... ... @@ -273,13 +273,6 @@
273 273  
274 274 ---------------------------
275 275  
276   -What: remove HID compat support
277   -When: 2.6.29
278   -Why: needed only as a temporary solution until distros fix themselves up
279   -Who: Jiri Slaby <jirislaby@gmail.com>
280   -
281   ----------------------------
282   -
283 276 What: print_fn_descriptor_symbol()
284 277 When: October 2009
285 278 Why: The %pF vsprintf format provides the same functionality in a
... ... @@ -70,18 +70,6 @@
70 70 menu "Special HID drivers"
71 71 depends on HID
72 72  
73   -config HID_COMPAT
74   - bool "Load all HID drivers on hid core load"
75   - default y
76   - ---help---
77   - Compatible option for older userspace. If you have system without udev
78   - support of module loading through aliases and also old
79   - module-init-tools which can't handle hid bus, choose Y here. Otherwise
80   - say N. If you say N and your userspace is old enough, the only
81   - functionality you lose is modules autoloading.
82   -
83   - If unsure, say Y.
84   -
85 73 config HID_A4TECH
86 74 tristate "A4 tech" if EMBEDDED
87 75 depends on USB_HID
drivers/hid/Makefile
Diff comments   View file @ afa5eb7
... ... @@ -8,10 +8,6 @@
8 8 hid-$(CONFIG_HID_DEBUG) += hid-debug.o
9 9 hid-$(CONFIG_HIDRAW) += hidraw.o
10 10  
11   -ifdef CONFIG_HID_COMPAT
12   -obj-m += hid-dummy.o
13   -endif
14   -
15 11 hid-logitech-objs := hid-lg.o
16 12 ifdef CONFIG_LOGITECH_FF
17 13 hid-logitech-objs += hid-lgff.o
drivers/hid/hid-a4tech.c
Diff comments   View file @ afa5eb7
... ... @@ -158,6 +158,4 @@
158 158 module_init(a4_init);
159 159 module_exit(a4_exit);
160 160 MODULE_LICENSE("GPL");
161   -
162   -HID_COMPAT_LOAD_DRIVER(a4tech);
drivers/hid/hid-apple.c
Diff comments   View file @ afa5eb7
... ... @@ -474,6 +474,4 @@
474 474 module_init(apple_init);
475 475 module_exit(apple_exit);
476 476 MODULE_LICENSE("GPL");
477   -
478   -HID_COMPAT_LOAD_DRIVER(apple);
drivers/hid/hid-belkin.c
Diff comments   View file @ afa5eb7
... ... @@ -101,6 +101,4 @@
101 101 module_init(belkin_init);
102 102 module_exit(belkin_exit);
103 103 MODULE_LICENSE("GPL");
104   -
105   -HID_COMPAT_LOAD_DRIVER(belkin);
drivers/hid/hid-cherry.c
Diff comments   View file @ afa5eb7
... ... @@ -83,6 +83,4 @@
83 83 module_init(ch_init);
84 84 module_exit(ch_exit);
85 85 MODULE_LICENSE("GPL");
86   -
87   -HID_COMPAT_LOAD_DRIVER(cherry);
drivers/hid/hid-chicony.c
Diff comments   View file @ afa5eb7
... ... @@ -76,6 +76,4 @@
76 76 module_init(ch_init);
77 77 module_exit(ch_exit);
78 78 MODULE_LICENSE("GPL");
79   -
80   -HID_COMPAT_LOAD_DRIVER(chicony);
drivers/hid/hid-core.c
Diff comments   View file @ afa5eb7
... ... @@ -1819,15 +1819,6 @@
1819 1819 }
1820 1820 EXPORT_SYMBOL_GPL(hid_unregister_driver);
1821 1821  
1822   -#ifdef CONFIG_HID_COMPAT
1823   -static void hid_compat_load(struct work_struct *ws)
1824   -{
1825   - request_module("hid-dummy");
1826   -}
1827   -static DECLARE_WORK(hid_compat_work, hid_compat_load);
1828   -static struct workqueue_struct *hid_compat_wq;
1829   -#endif
1830   -
1831 1822 static int __init hid_init(void)
1832 1823 {
1833 1824 int ret;
... ... @@ -1842,15 +1833,6 @@
1842 1833 if (ret)
1843 1834 goto err_bus;
1844 1835  
1845   -#ifdef CONFIG_HID_COMPAT
1846   - hid_compat_wq = create_singlethread_workqueue("hid_compat");
1847   - if (!hid_compat_wq) {
1848   - hidraw_exit();
1849   - goto err;
1850   - }
1851   - queue_work(hid_compat_wq, &hid_compat_work);
1852   -#endif
1853   -
1854 1836 return 0;
1855 1837 err_bus:
1856 1838 bus_unregister(&hid_bus_type);
... ... @@ -1860,9 +1842,6 @@
1860 1842  
1861 1843 static void __exit hid_exit(void)
1862 1844 {
1863   -#ifdef CONFIG_HID_COMPAT
1864   - destroy_workqueue(hid_compat_wq);
1865   -#endif
1866 1845 hidraw_exit();
1867 1846 bus_unregister(&hid_bus_type);
1868 1847 }
drivers/hid/hid-cypress.c
Diff comments   View file @ afa5eb7
... ... @@ -154,6 +154,4 @@
154 154 module_init(cp_init);
155 155 module_exit(cp_exit);
156 156 MODULE_LICENSE("GPL");
157   -
158   -HID_COMPAT_LOAD_DRIVER(cypress);
drivers/hid/hid-drff.c
Diff comments   View file @ afa5eb7
... ... @@ -186,6 +186,4 @@
186 186 module_init(dr_init);
187 187 module_exit(dr_exit);
188 188 MODULE_LICENSE("GPL");
189   -
190   -HID_COMPAT_LOAD_DRIVER(dragonrise);
drivers/hid/hid-dummy.c
View file @ afa5eb7
1   -#include <linux/autoconf.h>
2   -#include <linux/module.h>
3   -#include <linux/hid.h>
4   -
5   -static int __init hid_dummy_init(void)
6   -{
7   -#ifdef CONFIG_HID_A4TECH_MODULE
8   - HID_COMPAT_CALL_DRIVER(a4tech);
9   -#endif
10   -#ifdef CONFIG_HID_APPLE_MODULE
11   - HID_COMPAT_CALL_DRIVER(apple);
12   -#endif
13   -#ifdef CONFIG_HID_BELKIN_MODULE
14   - HID_COMPAT_CALL_DRIVER(belkin);
15   -#endif
16   -#ifdef CONFIG_HID_BRIGHT_MODULE
17   - HID_COMPAT_CALL_DRIVER(bright);
18   -#endif
19   -#ifdef CONFIG_HID_CHERRY_MODULE
20   - HID_COMPAT_CALL_DRIVER(cherry);
21   -#endif
22   -#ifdef CONFIG_HID_CHICONY_MODULE
23   - HID_COMPAT_CALL_DRIVER(chicony);
24   -#endif
25   -#ifdef CONFIG_HID_CYPRESS_MODULE
26   - HID_COMPAT_CALL_DRIVER(cypress);
27   -#endif
28   -#ifdef CONFIG_HID_DELL_MODULE
29   - HID_COMPAT_CALL_DRIVER(dell);
30   -#endif
31   -#ifdef CONFIG_DRAGONRISE_FF_MODULE
32   - HID_COMPAT_CALL_DRIVER(dragonrise);
33   -#endif
34   -#ifdef CONFIG_HID_EZKEY_MODULE
35   - HID_COMPAT_CALL_DRIVER(ezkey);
36   -#endif
37   -#ifdef CONFIG_HID_KYE_MODULE
38   - HID_COMPAT_CALL_DRIVER(kye);
39   -#endif
40   -#ifdef CONFIG_HID_GYRATION_MODULE
41   - HID_COMPAT_CALL_DRIVER(gyration);
42   -#endif
43   -#ifdef CONFIG_HID_KENSINGTON_MODULE
44   - HID_COMPAT_CALL_DRIVER(kensington);
45   -#endif
46   -#ifdef CONFIG_HID_LOGITECH_MODULE
47   - HID_COMPAT_CALL_DRIVER(logitech);
48   -#endif
49   -#ifdef CONFIG_HID_MICROSOFT_MODULE
50   - HID_COMPAT_CALL_DRIVER(microsoft);
51   -#endif
52   -#ifdef CONFIG_HID_MONTEREY_MODULE
53   - HID_COMPAT_CALL_DRIVER(monterey);
54   -#endif
55   -#ifdef CONFIG_HID_NTRIG_MODULE
56   - HID_COMPAT_CALL_DRIVER(ntrig);
57   -#endif
58   -#ifdef CONFIG_HID_PANTHERLORD_MODULE
59   - HID_COMPAT_CALL_DRIVER(pantherlord);
60   -#endif
61   -#ifdef CONFIG_HID_PETALYNX_MODULE
62   - HID_COMPAT_CALL_DRIVER(petalynx);
63   -#endif
64   -#ifdef CONFIG_HID_SAMSUNG_MODULE
65   - HID_COMPAT_CALL_DRIVER(samsung);
66   -#endif
67   -#ifdef CONFIG_HID_SONY_MODULE
68   - HID_COMPAT_CALL_DRIVER(sony);
69   -#endif
70   -#ifdef CONFIG_HID_SUNPLUS_MODULE
71   - HID_COMPAT_CALL_DRIVER(sunplus);
72   -#endif
73   -#ifdef CONFIG_GREENASIA_FF_MODULE
74   - HID_COMPAT_CALL_DRIVER(greenasia);
75   -#endif
76   -#ifdef CONFIG_THRUSTMASTER_FF_MODULE
77   - HID_COMPAT_CALL_DRIVER(thrustmaster);
78   -#endif
79   -#ifdef CONFIG_ZEROPLUS_FF_MODULE
80   - HID_COMPAT_CALL_DRIVER(zeroplus);
81   -#endif
82   -
83   - return -EIO;
84   -}
85   -module_init(hid_dummy_init);
86   -
87   -MODULE_LICENSE("GPL");
drivers/hid/hid-ezkey.c
Diff comments   View file @ afa5eb7
... ... @@ -91,6 +91,4 @@
91 91 module_init(ez_init);
92 92 module_exit(ez_exit);
93 93 MODULE_LICENSE("GPL");
94   -
95   -HID_COMPAT_LOAD_DRIVER(ezkey);
drivers/hid/hid-gaff.c
Diff comments   View file @ afa5eb7
... ... @@ -181,6 +181,4 @@
181 181 module_init(ga_init);
182 182 module_exit(ga_exit);
183 183 MODULE_LICENSE("GPL");
184   -
185   -HID_COMPAT_LOAD_DRIVER(greenasia);
drivers/hid/hid-gyration.c
Diff comments   View file @ afa5eb7
... ... @@ -94,6 +94,4 @@
94 94 module_init(gyration_init);
95 95 module_exit(gyration_exit);
96 96 MODULE_LICENSE("GPL");
97   -
98   -HID_COMPAT_LOAD_DRIVER(gyration);
drivers/hid/hid-kensington.c
Diff comments   View file @ afa5eb7
... ... @@ -61,6 +61,4 @@
61 61 module_init(ks_init);
62 62 module_exit(ks_exit);
63 63 MODULE_LICENSE("GPL");
64   -
65   -HID_COMPAT_LOAD_DRIVER(kensington);
drivers/hid/hid-kye.c
Diff comments   View file @ afa5eb7
... ... @@ -67,6 +67,4 @@
67 67 module_init(kye_init);
68 68 module_exit(kye_exit);
69 69 MODULE_LICENSE("GPL");
70   -
71   -HID_COMPAT_LOAD_DRIVER(kye);
drivers/hid/hid-lg.c
Diff comments   View file @ afa5eb7
... ... @@ -326,6 +326,4 @@
326 326 module_init(lg_init);
327 327 module_exit(lg_exit);
328 328 MODULE_LICENSE("GPL");
329   -
330   -HID_COMPAT_LOAD_DRIVER(logitech);
drivers/hid/hid-microsoft.c
Diff comments   View file @ afa5eb7
... ... @@ -210,6 +210,4 @@
210 210 module_init(ms_init);
211 211 module_exit(ms_exit);
212 212 MODULE_LICENSE("GPL");
213   -
214   -HID_COMPAT_LOAD_DRIVER(microsoft);
drivers/hid/hid-monterey.c
Diff comments   View file @ afa5eb7
... ... @@ -78,6 +78,4 @@
78 78 module_init(mr_init);
79 79 module_exit(mr_exit);
80 80 MODULE_LICENSE("GPL");
81   -
82   -HID_COMPAT_LOAD_DRIVER(monterey);
drivers/hid/hid-ntrig.c
Diff comments   View file @ afa5eb7
... ... @@ -78,6 +78,4 @@
78 78 module_init(ntrig_init);
79 79 module_exit(ntrig_exit);
80 80 MODULE_LICENSE("GPL");
81   -
82   -HID_COMPAT_LOAD_DRIVER(ntrig);
drivers/hid/hid-petalynx.c
Diff comments   View file @ afa5eb7
... ... @@ -118,6 +118,4 @@
118 118 module_init(pl_init);
119 119 module_exit(pl_exit);
120 120 MODULE_LICENSE("GPL");
121   -
122   -HID_COMPAT_LOAD_DRIVER(petalynx);
drivers/hid/hid-pl.c
Diff comments   View file @ afa5eb7
... ... @@ -230,6 +230,4 @@
230 230 module_init(pl_init);
231 231 module_exit(pl_exit);
232 232 MODULE_LICENSE("GPL");
233   -
234   -HID_COMPAT_LOAD_DRIVER(pantherlord);
drivers/hid/hid-samsung.c
Diff comments   View file @ afa5eb7
... ... @@ -96,6 +96,4 @@
96 96 module_init(samsung_init);
97 97 module_exit(samsung_exit);
98 98 MODULE_LICENSE("GPL");
99   -
100   -HID_COMPAT_LOAD_DRIVER(samsung);
drivers/hid/hid-sony.c
Diff comments   View file @ afa5eb7
... ... @@ -148,6 +148,4 @@
148 148 module_init(sony_init);
149 149 module_exit(sony_exit);
150 150 MODULE_LICENSE("GPL");
151   -
152   -HID_COMPAT_LOAD_DRIVER(sony);
drivers/hid/hid-sunplus.c
Diff comments   View file @ afa5eb7
... ... @@ -78,6 +78,4 @@
78 78 module_init(sp_init);
79 79 module_exit(sp_exit);
80 80 MODULE_LICENSE("GPL");
81   -
82   -HID_COMPAT_LOAD_DRIVER(sunplus);
drivers/hid/hid-tmff.c
Diff comments   View file @ afa5eb7
... ... @@ -265,6 +265,4 @@
265 265 module_init(tm_init);
266 266 module_exit(tm_exit);
267 267 MODULE_LICENSE("GPL");
268   -
269   -HID_COMPAT_LOAD_DRIVER(thrustmaster);
drivers/hid/hid-topseed.c
Diff comments   View file @ afa5eb7
... ... @@ -73,6 +73,4 @@
73 73 module_init(ts_init);
74 74 module_exit(ts_exit);
75 75 MODULE_LICENSE("GPL");
76   -
77   -HID_COMPAT_LOAD_DRIVER(topseed);
drivers/hid/hid-zpff.c
Diff comments   View file @ afa5eb7
... ... @@ -158,6 +158,4 @@
158 158 module_init(zp_init);
159 159 module_exit(zp_exit);
160 160 MODULE_LICENSE("GPL");
161   -
162   -HID_COMPAT_LOAD_DRIVER(zeroplus);
... ... @@ -792,21 +792,5 @@
792 792 __FILE__ , ## arg)
793 793 #endif /* HID_FF */
794 794  
795   -#ifdef __KERNEL__
796   -#ifdef CONFIG_HID_COMPAT
797   -#define HID_COMPAT_LOAD_DRIVER(name) \
798   -/* prototype to avoid sparse warning */ \
799   -extern void hid_compat_##name(void); \
800   -void hid_compat_##name(void) { } \
801   -EXPORT_SYMBOL(hid_compat_##name)
802   -#else
803   -#define HID_COMPAT_LOAD_DRIVER(name)
804   -#endif /* HID_COMPAT */
805   -#define HID_COMPAT_CALL_DRIVER(name) do { \
806   - extern void hid_compat_##name(void); \
807   - hid_compat_##name(); \
808   -} while (0)
809   -#endif /* __KERNEL__ */
810   -
811 795 #endif