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

Commit 733aca90 authored by Jaejoong Kim's avatar Jaejoong Kim Committed by Jiri Kosina
Browse files

HID: hiddev: reallocate hiddev's minor number 



We need to store the minor number each drivers. In case of hidraw, the
minor number is stored stores in struct hidraw. But hiddev's minor is
located in struct hid_device.

The hid-core driver announces a kernel message which driver is loaded when
HID device connected, but hiddev's minor number is always zero. To proper
display hiddev's minor number, we need to store the minor number asked from
usb core and do some refactoring work (move from hiddev.c to hiddev.h) to
access hiddev in hid-core.

[jkosina@suse.cz: rebase on top of newer codebase]
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJaejoong Kim <climbbb.kim@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 42cb6b35

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1695,7 +1695,7 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 
		len += sprintf(buf + len, "input");

	if (hdev->claimed & HID_CLAIMED_HIDDEV)

		len += sprintf(buf + len, "%shiddev%d", len ? "," : "",

				hdev->minor);

				((struct hiddev *)hdev->hiddev)->minor);

	if (hdev->claimed & HID_CLAIMED_HIDRAW)

		len += sprintf(buf + len, "%shidraw%d", len ? "," : "",

				((struct hidraw *)hdev->hidraw)->minor);

drivers/hid/usbhid/hiddev.c

+2 −11
Original line number Diff line number Diff line
@@ -46,17 +46,6 @@ 
#endif

#define HIDDEV_BUFFER_SIZE	2048



struct hiddev {

	int exist;

	int open;

	struct mutex existancelock;

	wait_queue_head_t wait;

	struct hid_device *hid;

	struct list_head list;

	spinlock_t list_lock;

	bool initialized;

};



struct hiddev_list {

	struct hiddev_usage_ref buffer[HIDDEV_BUFFER_SIZE];

	int head;
@@ -923,6 +912,8 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) 
	 */

	hiddev->initialized = hid->quirks & HID_QUIRK_NO_INIT_REPORTS;



	hiddev->minor = usbhid->intf->minor;



	return 0;

}

include/linux/hid.h

+0 −1
Original line number Diff line number Diff line
@@ -541,7 +541,6 @@ struct hid_device { /* device report descriptor */ 
	struct list_head inputs;					/* The list of inputs */

	void *hiddev;							/* The hiddev structure */

	void *hidraw;

	int minor;							/* Hiddev minor number */



	int open;							/* is the device open by anyone? */

	char name[128];							/* Device name */

include/linux/hiddev.h

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,18 @@ 
 * In-kernel definitions.

 */



struct hiddev {

	int minor;

	int exist;

	int open;

	struct mutex existancelock;

	wait_queue_head_t wait;

	struct hid_device *hid;

	struct list_head list;

	spinlock_t list_lock;

	bool initialized;

};



struct hid_device;

struct hid_usage;

struct hid_field;