HID: Kconfig: Remove explicit transport layer dependencies

Most HID drivers (rightfully) only depend on the HID bus, not the specific transport layer. Remove such dependencies where applicable. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>

HID: Kconfig: Remove explicit transport layer dependencies
Most HID drivers (rightfully) only depend on the HID bus, not the specific transport layer. Remove such dependencies where applicable. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Benjamin Tissoires · Jiri Kosina
1 parent 3373443bef
Showing 5 changed files with 34 additions and 39 deletions Side-by-side Diff
drivers/hid/Kconfig
drivers/hid/hid-apple.c
drivers/hid/hid-magicmouse.c
drivers/hid/hid-speedlink.c
drivers/hid/hid-thingm.c
@@ -92,7 +92,7 @@
  
 config HID_A4TECH
 	tristate "A4 tech mice" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for A4 tech X5 and WOP-35 / Trust 450L mice.
@@ -113,7 +113,7 @@
  
 config HID_APPLE
 	tristate "Apple {i,Power,Mac}Books" if EXPERT
-	depends on (USB_HID || BT_HIDP)
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for some Apple devices which less or more break
  
  
  
@@ -124,27 +124,27 @@
  
 config HID_AUREAL
 	tristate "Aureal"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Aureal Cy se W-01RN Remote Controller and other Aureal derived remotes.
  
 config HID_BELKIN
 	tristate "Belkin Flip KVM and Wireless keyboard" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Belkin Flip KVM and Wireless keyboard.
  
 config HID_CHERRY
 	tristate "Cherry Cymotion keyboard" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Cherry Cymotion keyboard.
  
 config HID_CHICONY
 	tristate "Chicony Tactical pad" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Chicony Tactical pad.
@@ -166,7 +166,7 @@
  
 config HID_CYPRESS
 	tristate "Cypress mouse and barcode readers" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for cypress mouse and barcode readers.
  
@@ -202,13 +202,13 @@
  
 config HID_ELECOM
 	tristate "ELECOM BM084 bluetooth mouse"
-	depends on BT_HIDP
+	depends on HID
 	---help---
 	Support for the ELECOM BM084 (bluetooth mouse).
  
 config HID_EZKEY
 	tristate "Ezkey BTC 8193 keyboard" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Ezkey BTC 8193 keyboard.
@@ -231,7 +231,7 @@
  
 config HID_KEYTOUCH
 	tristate "Keytouch HID devices"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Keytouch HID devices not fully compliant with
 	the specification. Currently supported:
  
  
  
@@ -249,25 +249,25 @@
  
 config HID_UCLOGIC
 	tristate "UC-Logic"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for UC-Logic tablets.
  
 config HID_WALTOP
 	tristate "Waltop"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Waltop tablets.
  
 config HID_GYRATION
 	tristate "Gyration remote control"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Gyration remote control.
  
 config HID_ICADE
 	tristate "ION iCade arcade controller"
-	depends on BT_HIDP
+	depends on HID
 	---help---
 	Support for the ION iCade arcade controller to work as a joystick.
  
  
  
@@ -276,20 +276,20 @@
  
 config HID_TWINHAN
 	tristate "Twinhan IR remote control"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Twinhan IR remote control.
  
 config HID_KENSINGTON
 	tristate "Kensington Slimblade Trackball" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Kensington Slimblade Trackball.
  
 config HID_LCPOWER
 	tristate "LC-Power"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for LC-Power RC1000MCE RF remote control.
  
@@ -308,7 +308,7 @@
  
 config HID_LOGITECH
 	tristate "Logitech devices" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Logitech devices that are not fully compliant with HID standard.
@@ -374,7 +374,7 @@
  
 config HID_MAGICMOUSE
 	tristate "Apple MagicMouse multi-touch support"
-	depends on BT_HIDP
+	depends on HID
 	---help---
 	Support for the Apple Magic Mouse multi-touch.
  
  
@@ -383,14 +383,14 @@
  
 config HID_MICROSOFT
 	tristate "Microsoft non-fully HID-compliant devices" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Microsoft devices that are not fully compliant with HID standard.
  
 config HID_MONTEREY
 	tristate "Monterey Genius KB29E keyboard" if EXPERT
-	depends on USB_HID
+	depends on HID
 	default !EXPERT
 	---help---
 	Support for Monterey Genius KB29E.
@@ -445,7 +445,7 @@
  
 config HID_ORTEK
 	tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad"
-	depends on USB_HID
+	depends on HID
 	---help---
 	There are certain devices which have LogicalMaximum wrong in the keyboard
 	usage page of their report descriptor. The most prevailing ones so far
@@ -473,7 +473,7 @@
  
 config HID_PETALYNX
 	tristate "Petalynx Maxter remote control"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Petalynx Maxter remote control.
  
  
@@ -545,14 +545,14 @@
  
 config HID_PRIMAX
 	tristate "Primax non-fully HID-compliant devices"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Primax devices that are not fully compliant with the
 	HID standard.
  
 config HID_PS3REMOTE
 	tristate "Sony PS3 BD Remote Control"
-	depends on BT_HIDP
+	depends on HID
 	---help---
 	Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech
 	Harmony Adapter for PS3, which connect over Bluetooth.
@@ -569,7 +569,7 @@
  
 config HID_SAITEK
 	tristate "Saitek non-fully HID-compliant devices"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Saitek devices that are not fully compliant with the
 	HID standard.
@@ -578,7 +578,7 @@
  
 config HID_SAMSUNG
 	tristate "Samsung InfraRed remote control or keyboards"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Samsung InfraRed remote control or keyboards.
  
@@ -604,7 +604,7 @@
  
 config HID_SUNPLUS
 	tristate "Sunplus wireless desktop"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Sunplus wireless desktop.
  
  
  
@@ -650,20 +650,20 @@
  
 config HID_TIVO
 	tristate "TiVo Slide Bluetooth remote control support"
-	depends on (USB_HID || BT_HIDP)
+	depends on HID
 	---help---
 	Say Y if you have a TiVo Slide Bluetooth remote control.
  
 config HID_TOPSEED
 	tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
 	CLLRCMCE remote control.
  
 config HID_THINGM
 	tristate "ThingM blink(1) USB RGB LED"
-	depends on USB_HID
+	depends on HID
 	depends on LEDS_CLASS
 	---help---
 	Support for the ThingM blink(1) USB RGB LED. This driver registers a
@@ -689,7 +689,7 @@
  
 config HID_WACOM
 	tristate "Wacom Bluetooth devices support"
-	depends on BT_HIDP
+	depends on HID
 	depends on LEDS_CLASS
 	select POWER_SUPPLY
 	---help---
@@ -697,7 +697,7 @@
  
 config HID_WIIMOTE
 	tristate "Nintendo Wii Remote support"
-	depends on BT_HIDP
+	depends on HID
 	depends on LEDS_CLASS
 	select POWER_SUPPLY
 	select INPUT_FF_MEMLESS
@@ -729,7 +729,7 @@
  
 config HID_ZYDACRON
 	tristate "Zydacron remote control support"
-	depends on USB_HID
+	depends on HID
 	---help---
 	Support for Zydacron remote control.
  
@@ -21,7 +21,6 @@
 #include <linux/hid.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/usb.h>
  
 #include "hid-ids.h"
  
@@ -19,7 +19,6 @@
 #include <linux/input/mt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/usb.h>
  
 #include "hid-ids.h"
  
@@ -16,10 +16,8 @@
 #include <linux/device.h>
 #include <linux/hid.h>
 #include <linux/module.h>
-#include <linux/usb.h>
  
 #include "hid-ids.h"
-#include "usbhid/usbhid.h"
  
 static const struct hid_device_id speedlink_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE)},
@@ -12,7 +12,6 @@
 #include <linux/hid.h>
 #include <linux/leds.h>
 #include <linux/module.h>
-#include <linux/usb.h>
  
 #include "hid-ids.h"
...	...	@@ -92,7 +92,7 @@
92	92
93	93	config HID_A4TECH
94	94	tristate "A4 tech mice" if EXPERT
95		- depends on USB_HID
	95	+ depends on HID
96	96	default !EXPERT
97	97	---help---
98	98	Support for A4 tech X5 and WOP-35 / Trust 450L mice.
...	...	@@ -113,7 +113,7 @@
113	113
114	114	config HID_APPLE
115	115	tristate "Apple {i,Power,Mac}Books" if EXPERT
116		- depends on (USB_HID \|\| BT_HIDP)
	116	+ depends on HID
117	117	default !EXPERT
118	118	---help---
119	119	Support for some Apple devices which less or more break
120	120
121	121
122	122
...	...	@@ -124,27 +124,27 @@
124	124
125	125	config HID_AUREAL
126	126	tristate "Aureal"
127		- depends on USB_HID
	127	+ depends on HID
128	128	---help---
129	129	Support for Aureal Cy se W-01RN Remote Controller and other Aureal derived remotes.
130	130
131	131	config HID_BELKIN
132	132	tristate "Belkin Flip KVM and Wireless keyboard" if EXPERT
133		- depends on USB_HID
	133	+ depends on HID
134	134	default !EXPERT
135	135	---help---
136	136	Support for Belkin Flip KVM and Wireless keyboard.
137	137
138	138	config HID_CHERRY
139	139	tristate "Cherry Cymotion keyboard" if EXPERT
140		- depends on USB_HID
	140	+ depends on HID
141	141	default !EXPERT
142	142	---help---
143	143	Support for Cherry Cymotion keyboard.
144	144
145	145	config HID_CHICONY
146	146	tristate "Chicony Tactical pad" if EXPERT
147		- depends on USB_HID
	147	+ depends on HID
148	148	default !EXPERT
149	149	---help---
150	150	Support for Chicony Tactical pad.
...	...	@@ -166,7 +166,7 @@
166	166
167	167	config HID_CYPRESS
168	168	tristate "Cypress mouse and barcode readers" if EXPERT
169		- depends on USB_HID
	169	+ depends on HID
170	170	default !EXPERT
171	171	---help---
172	172	Support for cypress mouse and barcode readers.
173	173
...	...	@@ -202,13 +202,13 @@
202	202
203	203	config HID_ELECOM
204	204	tristate "ELECOM BM084 bluetooth mouse"
205		- depends on BT_HIDP
	205	+ depends on HID
206	206	---help---
207	207	Support for the ELECOM BM084 (bluetooth mouse).
208	208
209	209	config HID_EZKEY
210	210	tristate "Ezkey BTC 8193 keyboard" if EXPERT
211		- depends on USB_HID
	211	+ depends on HID
212	212	default !EXPERT
213	213	---help---
214	214	Support for Ezkey BTC 8193 keyboard.
...	...	@@ -231,7 +231,7 @@
231	231
232	232	config HID_KEYTOUCH
233	233	tristate "Keytouch HID devices"
234		- depends on USB_HID
	234	+ depends on HID
235	235	---help---
236	236	Support for Keytouch HID devices not fully compliant with
237	237	the specification. Currently supported:
238	238
239	239
240	240
...	...	@@ -249,25 +249,25 @@
249	249
250	250	config HID_UCLOGIC
251	251	tristate "UC-Logic"
252		- depends on USB_HID
	252	+ depends on HID
253	253	---help---
254	254	Support for UC-Logic tablets.
255	255
256	256	config HID_WALTOP
257	257	tristate "Waltop"
258		- depends on USB_HID
	258	+ depends on HID
259	259	---help---
260	260	Support for Waltop tablets.
261	261
262	262	config HID_GYRATION
263	263	tristate "Gyration remote control"
264		- depends on USB_HID
	264	+ depends on HID
265	265	---help---
266	266	Support for Gyration remote control.
267	267
268	268	config HID_ICADE
269	269	tristate "ION iCade arcade controller"
270		- depends on BT_HIDP
	270	+ depends on HID
271	271	---help---
272	272	Support for the ION iCade arcade controller to work as a joystick.
273	273
274	274
275	275
...	...	@@ -276,20 +276,20 @@
276	276
277	277	config HID_TWINHAN
278	278	tristate "Twinhan IR remote control"
279		- depends on USB_HID
	279	+ depends on HID
280	280	---help---
281	281	Support for Twinhan IR remote control.
282	282
283	283	config HID_KENSINGTON
284	284	tristate "Kensington Slimblade Trackball" if EXPERT
285		- depends on USB_HID
	285	+ depends on HID
286	286	default !EXPERT
287	287	---help---
288	288	Support for Kensington Slimblade Trackball.
289	289
290	290	config HID_LCPOWER
291	291	tristate "LC-Power"
292		- depends on USB_HID
	292	+ depends on HID
293	293	---help---
294	294	Support for LC-Power RC1000MCE RF remote control.
295	295
...	...	@@ -308,7 +308,7 @@
308	308
309	309	config HID_LOGITECH
310	310	tristate "Logitech devices" if EXPERT
311		- depends on USB_HID
	311	+ depends on HID
312	312	default !EXPERT
313	313	---help---
314	314	Support for Logitech devices that are not fully compliant with HID standard.
...	...	@@ -374,7 +374,7 @@
374	374
375	375	config HID_MAGICMOUSE
376	376	tristate "Apple MagicMouse multi-touch support"
377		- depends on BT_HIDP
	377	+ depends on HID
378	378	---help---
379	379	Support for the Apple Magic Mouse multi-touch.
380	380
381	381
...	...	@@ -383,14 +383,14 @@
383	383
384	384	config HID_MICROSOFT
385	385	tristate "Microsoft non-fully HID-compliant devices" if EXPERT
386		- depends on USB_HID
	386	+ depends on HID
387	387	default !EXPERT
388	388	---help---
389	389	Support for Microsoft devices that are not fully compliant with HID standard.
390	390
391	391	config HID_MONTEREY
392	392	tristate "Monterey Genius KB29E keyboard" if EXPERT
393		- depends on USB_HID
	393	+ depends on HID
394	394	default !EXPERT
395	395	---help---
396	396	Support for Monterey Genius KB29E.
...	...	@@ -445,7 +445,7 @@
445	445
446	446	config HID_ORTEK
447	447	tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad"
448		- depends on USB_HID
	448	+ depends on HID
449	449	---help---
450	450	There are certain devices which have LogicalMaximum wrong in the keyboard
451	451	usage page of their report descriptor. The most prevailing ones so far
...	...	@@ -473,7 +473,7 @@
473	473
474	474	config HID_PETALYNX
475	475	tristate "Petalynx Maxter remote control"
476		- depends on USB_HID
	476	+ depends on HID
477	477	---help---
478	478	Support for Petalynx Maxter remote control.
479	479
480	480
...	...	@@ -545,14 +545,14 @@
545	545
546	546	config HID_PRIMAX
547	547	tristate "Primax non-fully HID-compliant devices"
548		- depends on USB_HID
	548	+ depends on HID
549	549	---help---
550	550	Support for Primax devices that are not fully compliant with the
551	551	HID standard.
552	552
553	553	config HID_PS3REMOTE
554	554	tristate "Sony PS3 BD Remote Control"
555		- depends on BT_HIDP
	555	+ depends on HID
556	556	---help---
557	557	Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech
558	558	Harmony Adapter for PS3, which connect over Bluetooth.
...	...	@@ -569,7 +569,7 @@
569	569
570	570	config HID_SAITEK
571	571	tristate "Saitek non-fully HID-compliant devices"
572		- depends on USB_HID
	572	+ depends on HID
573	573	---help---
574	574	Support for Saitek devices that are not fully compliant with the
575	575	HID standard.
...	...	@@ -578,7 +578,7 @@
578	578
579	579	config HID_SAMSUNG
580	580	tristate "Samsung InfraRed remote control or keyboards"
581		- depends on USB_HID
	581	+ depends on HID
582	582	---help---
583	583	Support for Samsung InfraRed remote control or keyboards.
584	584
...	...	@@ -604,7 +604,7 @@
604	604
605	605	config HID_SUNPLUS
606	606	tristate "Sunplus wireless desktop"
607		- depends on USB_HID
	607	+ depends on HID
608	608	---help---
609	609	Support for Sunplus wireless desktop.
610	610
611	611
612	612
...	...	@@ -650,20 +650,20 @@
650	650
651	651	config HID_TIVO
652	652	tristate "TiVo Slide Bluetooth remote control support"
653		- depends on (USB_HID \|\| BT_HIDP)
	653	+ depends on HID
654	654	---help---
655	655	Say Y if you have a TiVo Slide Bluetooth remote control.
656	656
657	657	config HID_TOPSEED
658	658	tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"
659		- depends on USB_HID
	659	+ depends on HID
660	660	---help---
661	661	Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic
662	662	CLLRCMCE remote control.
663	663
664	664	config HID_THINGM
665	665	tristate "ThingM blink(1) USB RGB LED"
666		- depends on USB_HID
	666	+ depends on HID
667	667	depends on LEDS_CLASS
668	668	---help---
669	669	Support for the ThingM blink(1) USB RGB LED. This driver registers a
...	...	@@ -689,7 +689,7 @@
689	689
690	690	config HID_WACOM
691	691	tristate "Wacom Bluetooth devices support"
692		- depends on BT_HIDP
	692	+ depends on HID
693	693	depends on LEDS_CLASS
694	694	select POWER_SUPPLY
695	695	---help---
...	...	@@ -697,7 +697,7 @@
697	697
698	698	config HID_WIIMOTE
699	699	tristate "Nintendo Wii Remote support"
700		- depends on BT_HIDP
	700	+ depends on HID
701	701	depends on LEDS_CLASS
702	702	select POWER_SUPPLY
703	703	select INPUT_FF_MEMLESS
...	...	@@ -729,7 +729,7 @@
729	729
730	730	config HID_ZYDACRON
731	731	tristate "Zydacron remote control support"
732		- depends on USB_HID
	732	+ depends on HID
733	733	---help---
734	734	Support for Zydacron remote control.
735	735
...	...	@@ -21,7 +21,6 @@
21	21	#include <linux/hid.h>
22	22	#include <linux/module.h>
23	23	#include <linux/slab.h>
24		-#include <linux/usb.h>
25	24
26	25	#include "hid-ids.h"
27	26
...	...	@@ -19,7 +19,6 @@
19	19	#include <linux/input/mt.h>
20	20	#include <linux/module.h>
21	21	#include <linux/slab.h>
22		-#include <linux/usb.h>
23	22
24	23	#include "hid-ids.h"
25	24
...	...	@@ -16,10 +16,8 @@
16	16	#include <linux/device.h>
17	17	#include <linux/hid.h>
18	18	#include <linux/module.h>
19		-#include <linux/usb.h>
20	19
21	20	#include "hid-ids.h"
22		-#include "usbhid/usbhid.h"
23	21
24	22	static const struct hid_device_id speedlink_devices[] = {
25	23	{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE)},
...	...	@@ -12,7 +12,6 @@
12	12	#include <linux/hid.h>
13	13	#include <linux/leds.h>
14	14	#include <linux/module.h>
15		-#include <linux/usb.h>
16	15
17	16	#include "hid-ids.h"
18	17