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

Commit 4916b3a5 authored by Jiri Kosina's avatar Jiri Kosina Committed by Greg Kroah-Hartman
Browse files

[PATCH] Generic HID layer - USB API 



- 'dev' in struct hid_device changed from struct usb_device to
  struct device and fixed all the users
- renamed functions which are part of USB HID API from 'hid_*' to
  'usbhid_*'
- force feedback initialization moved from common part into USB-specific
  driver
- added usbhid.h header for USB HID API users
- removed USB-specific fields from struct hid_device and moved them
  to new usbhid_device, which is pointed to by hid_device->driver_data
- fixed all USB users to use this new structure

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 229695e5

drivers/hid/hid-input.c

+2 −8
Original line number Diff line number Diff line
@@ -798,8 +798,7 @@ int hidinput_connect(struct hid_device *hid) 
				input_dev->id.vendor  = hid->vendor;

				input_dev->id.product = hid->product;

				input_dev->id.version = hid->version;

				input_dev->cdev.dev = &hid->intf->dev;



				input_dev->cdev.dev = hid->dev;

				hidinput->input = input_dev;

				list_add_tail(&hidinput->list, &hid->inputs);

			}
@@ -821,13 +820,8 @@ int hidinput_connect(struct hid_device *hid) 
			}

		}



	/* This only gets called when we are a single-input (most of the

	 * time). IOW, not a HID_QUIRK_MULTI_INPUT. The hid_ff_init() is

	 * only useful in this case, and not for multi-input quirks. */

	if (hidinput) {

		hid_ff_init(hid);

	if (hidinput)

		input_register_device(hidinput->input);

	}



	return 0;

}