Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fba0925 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: remove compat stuff
  HID: constify arrays of struct apple_key_translation
  HID: add support for Kye/Genius Ergo 525V
  HID: Support Apple mini aluminum keyboard
  HID: support for Kensington slimblade device
  HID: DragonRise game controller force feedback driver
  HID: add support for another version of 0e8f:0003 device in hid-pl
  HID: fix race between usb_register_dev() and hiddev_open()
  HID: bring back possibility to specify vid/pid ignore on module load
  HID: make HID_DEBUG defaults consistent
  HID: autosuspend -- fix lockup of hid on reset
  HID: hid_reset_resume() needs to be defined only when CONFIG_PM is set
  HID: fix USB HID devices after STD with autosuspend
  HID: do not try to compile PM code with CONFIG_PM unset
  HID: autosuspend support for USB HID
parents 811158b1 621de593

Documentation/feature-removal-schedule.txt

+0 −7
Original line number Diff line number Diff line
@@ -283,13 +283,6 @@ Who: Glauber Costa <gcosta@redhat.com> 


---------------------------



What:	remove HID compat support

When:	2.6.29

Why:	needed only as a temporary solution until distros fix themselves up

Who:	Jiri Slaby <jirislaby@gmail.com>



---------------------------



What: print_fn_descriptor_symbol()

When: October 2009

Why:  The %pF vsprintf format provides the same functionality in a

drivers/hid/Kconfig

+25 −15
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ config HID 


	  For docs and specs, see http://www.usb.org/developers/hidpage/



	  If unsure, say Y

	  If unsure, say Y.



config HID_DEBUG

	bool "HID debugging support"

	default y if !EMBEDDED

	default y

	depends on HID

	---help---

	This option lets the HID layer output diagnostics about its internal
@@ -44,7 +44,7 @@ config HID_DEBUG 
	This feature is useful for those who are either debugging the HID parser

	or any HID hardware device.



	If unsure, say N

	If unsure, say Y.



config HIDRAW

	bool "/dev/hidraw raw HID device support"
@@ -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
@@ -128,6 +116,14 @@ config HID_CYPRESS 
	---help---

	Support for cypress mouse and barcode readers.



config DRAGONRISE_FF

	tristate "DragonRise Inc. force feedback support"

	depends on USB_HID

	select INPUT_FF_MEMLESS

	---help---

	Say Y here if you want to enable force feedback support for DragonRise Inc.

	game controllers.



config HID_EZKEY

	tristate "Ezkey" if EMBEDDED

	depends on USB_HID
@@ -135,6 +131,13 @@ config HID_EZKEY 
	---help---

	Support for Ezkey BTC 8193 keyboard.



config HID_KYE

	tristate "Kye" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Kye/Genius Ergo Mouse.



config HID_GYRATION

	tristate "Gyration" if EMBEDDED

	depends on USB_HID
@@ -142,6 +145,13 @@ config HID_GYRATION 
	---help---

	Support for Gyration remote control.



config HID_KENSINGTON

	tristate "Kensington" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Kensington Slimblade Trackball.



config HID_LOGITECH

	tristate "Logitech" if EMBEDDED

	depends on USB_HID

drivers/hid/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -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
@@ -26,8 +22,11 @@ obj-$(CONFIG_HID_BELKIN) += hid-belkin.o 
obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o

obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o

obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o

obj-$(CONFIG_DRAGONRISE_FF)	+= hid-drff.o

obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o

obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o

obj-$(CONFIG_HID_KENSINGTON)	+= hid-kensington.o

obj-$(CONFIG_HID_KYE)		+= hid-kye.o

obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

drivers/hid/hid-a4tech.c

+0 −2
Original line number Diff line number Diff line
@@ -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

+15 −11
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct apple_key_translation { 
	u8 flags;

};



static struct apple_key_translation apple_fn_keys[] = {

static const struct apple_key_translation apple_fn_keys[] = {

	{ KEY_BACKSPACE, KEY_DELETE },

	{ KEY_ENTER,	KEY_INSERT },

	{ KEY_F1,	KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
@@ -75,7 +75,7 @@ static struct apple_key_translation apple_fn_keys[] = { 
	{ }

};



static struct apple_key_translation powerbook_fn_keys[] = {

static const struct apple_key_translation powerbook_fn_keys[] = {

	{ KEY_BACKSPACE, KEY_DELETE },

	{ KEY_F1,	KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },

	{ KEY_F2,	KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
@@ -94,7 +94,7 @@ static struct apple_key_translation powerbook_fn_keys[] = { 
	{ }

};



static struct apple_key_translation powerbook_numlock_keys[] = {

static const struct apple_key_translation powerbook_numlock_keys[] = {

	{ KEY_J,	KEY_KP1 },

	{ KEY_K,	KEY_KP2 },

	{ KEY_L,	KEY_KP3 },
@@ -117,16 +117,16 @@ static struct apple_key_translation powerbook_numlock_keys[] = { 
	{ }

};



static struct apple_key_translation apple_iso_keyboard[] = {

static const struct apple_key_translation apple_iso_keyboard[] = {

	{ KEY_GRAVE,	KEY_102ND },

	{ KEY_102ND,	KEY_GRAVE },

	{ }

};



static struct apple_key_translation *apple_find_translation(

		struct apple_key_translation *table, u16 from)

static const struct apple_key_translation *apple_find_translation(

		const struct apple_key_translation *table, u16 from)

{

	struct apple_key_translation *trans;

	const struct apple_key_translation *trans;



	/* Look for the translation */

	for (trans = table; trans->from; trans++)
@@ -140,7 +140,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		struct hid_usage *usage, __s32 value)

{

	struct apple_sc *asc = hid_get_drvdata(hid);

	struct apple_key_translation *trans;

	const struct apple_key_translation *trans;



	if (usage->code == KEY_FN) {

		asc->fn_on = !!value;
@@ -253,7 +253,7 @@ static void apple_report_fixup(struct hid_device *hdev, __u8 *rdesc, 


static void apple_setup_input(struct input_dev *input)

{

	struct apple_key_translation *trans;

	const struct apple_key_translation *trans;



	set_bit(KEY_NUMLOCK, input->keybit);
@@ -387,6 +387,12 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
@@ -468,5 +474,3 @@ static void apple_exit(void) 
module_init(apple_init);

module_exit(apple_exit);

MODULE_LICENSE("GPL");
 


HID_COMPAT_LOAD_DRIVER(apple);