diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-03-18 04:13:37 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-03-30 09:12:54 -0400 |
commit | afa5eb7c68689ced4284f01c96feed44a2d0a127 (patch) | |
tree | 3c92a5ec36a82c08a85aae918c7f29252562e2aa /drivers/hid/hid-core.c | |
parent | b2ddd54e19dfff559a02ec8e7e532357b3f09849 (diff) |
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>
Diffstat (limited to 'drivers/hid/hid-core.c')
-rw-r--r-- | drivers/hid/hid-core.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index b96fbd5dab55..e56f8d5d3a50 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1819,15 +1819,6 @@ void hid_unregister_driver(struct hid_driver *hdrv) | |||
1819 | } | 1819 | } |
1820 | EXPORT_SYMBOL_GPL(hid_unregister_driver); | 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 | static int __init hid_init(void) | 1822 | static int __init hid_init(void) |
1832 | { | 1823 | { |
1833 | int ret; | 1824 | int ret; |
@@ -1842,15 +1833,6 @@ static int __init hid_init(void) | |||
1842 | if (ret) | 1833 | if (ret) |
1843 | goto err_bus; | 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 | return 0; | 1836 | return 0; |
1855 | err_bus: | 1837 | err_bus: |
1856 | bus_unregister(&hid_bus_type); | 1838 | bus_unregister(&hid_bus_type); |
@@ -1860,9 +1842,6 @@ err: | |||
1860 | 1842 | ||
1861 | static void __exit hid_exit(void) | 1843 | static void __exit hid_exit(void) |
1862 | { | 1844 | { |
1863 | #ifdef CONFIG_HID_COMPAT | ||
1864 | destroy_workqueue(hid_compat_wq); | ||
1865 | #endif | ||
1866 | hidraw_exit(); | 1845 | hidraw_exit(); |
1867 | bus_unregister(&hid_bus_type); | 1846 | bus_unregister(&hid_bus_type); |
1868 | } | 1847 | } |