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

Commit c4c259bc authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: consolidate connect and disconnect into core code 



HID core registers input, hidraw and hiddev devices, but leaves
unregistering it up to the individual driver, which is not really nice.
Let's move all the logic to the core.

Reported-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Reported-by: default avatarBrian Rogers <brian@xyzw.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d1ff6522

drivers/hid/hid-core.c

+11 −0
Original line number Diff line number Diff line
@@ -1237,6 +1237,17 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 
}

EXPORT_SYMBOL_GPL(hid_connect);



void hid_disconnect(struct hid_device *hdev)

{

	if (hdev->claimed & HID_CLAIMED_INPUT)

		hidinput_disconnect(hdev);

	if (hdev->claimed & HID_CLAIMED_HIDDEV)

		hdev->hiddev_disconnect(hdev);

	if (hdev->claimed & HID_CLAIMED_HIDRAW)

		hidraw_disconnect(hdev);

}

EXPORT_SYMBOL_GPL(hid_disconnect);



/* a list of devices for which there is a specialized driver on HID bus */

static const struct hid_device_id hid_blacklist[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },

drivers/hid/usbhid/hid-core.c

+5 −11
Original line number Diff line number Diff line
@@ -1041,13 +1041,6 @@ static void usbhid_stop(struct hid_device *hid) 


	hid_cancel_delayed_stuff(usbhid);



	if (hid->claimed & HID_CLAIMED_INPUT)

		hidinput_disconnect(hid);

	if (hid->claimed & HID_CLAIMED_HIDDEV)

		hiddev_disconnect(hid);

	if (hid->claimed & HID_CLAIMED_HIDRAW)

		hidraw_disconnect(hid);



	hid->claimed = 0;



	usb_free_urb(usbhid->urbin);
@@ -1085,7 +1078,7 @@ static struct hid_ll_driver usb_hid_driver = { 
	.hidinput_input_event = usb_hidinput_input_event,

};



static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)

static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id)

{

	struct usb_host_interface *interface = intf->cur_altsetting;

	struct usb_device *dev = interface_to_usbdev(intf);
@@ -1117,6 +1110,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	hid->ff_init = hid_pidff_init;

#ifdef CONFIG_USB_HIDDEV

	hid->hiddev_connect = hiddev_connect;

	hid->hiddev_disconnect = hiddev_disconnect;

	hid->hiddev_hid_event = hiddev_hid_event;

	hid->hiddev_report_event = hiddev_report_event;

#endif
@@ -1177,7 +1171,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	return ret;

}



static void hid_disconnect(struct usb_interface *intf)

static void usbhid_disconnect(struct usb_interface *intf)

{

	struct hid_device *hid = usb_get_intfdata(intf);

	struct usbhid_device *usbhid;
@@ -1359,8 +1353,8 @@ MODULE_DEVICE_TABLE (usb, hid_usb_ids); 


static struct usb_driver hid_driver = {

	.name =		"usbhid",

	.probe =	hid_probe,

	.disconnect =	hid_disconnect,

	.probe =	usbhid_probe,

	.disconnect =	usbhid_disconnect,

#ifdef CONFIG_PM

	.suspend =	hid_suspend,

	.resume =	hid_resume,

include/linux/hid.h

+3 −0
Original line number Diff line number Diff line
@@ -494,6 +494,7 @@ struct hid_device { /* device report descriptor */ 


	/* hiddev event handler */

	int (*hiddev_connect)(struct hid_device *, unsigned int);

	void (*hiddev_disconnect)(struct hid_device *);

	void (*hiddev_hid_event) (struct hid_device *, struct hid_field *field,

				  struct hid_usage *, __s32);

	void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
@@ -691,6 +692,7 @@ struct hid_device *hid_allocate_device(void); 
int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);

int hid_check_keys_pressed(struct hid_device *hid);

int hid_connect(struct hid_device *hid, unsigned int connect_mask);

void hid_disconnect(struct hid_device *hid);



/**

 * hid_map_usage - map usage input bits
@@ -800,6 +802,7 @@ static inline int __must_check hid_hw_start(struct hid_device *hdev, 
 */

static inline void hid_hw_stop(struct hid_device *hdev)

{

	hid_disconnect(hdev);

	hdev->ll_driver->stop(hdev);

}

net/bluetooth/hidp/core.c

+0 −7
Original line number Diff line number Diff line
@@ -577,11 +577,6 @@ static int hidp_session(void *arg) 
	}



	if (session->hid) {

		if (session->hid->claimed & HID_CLAIMED_INPUT)

			hidinput_disconnect(session->hid);

		if (session->hid->claimed & HID_CLAIMED_HIDRAW)

			hidraw_disconnect(session->hid);



		hid_destroy_device(session->hid);

		session->hid = NULL;

	}
@@ -747,8 +742,6 @@ static void hidp_stop(struct hid_device *hid) 
	skb_queue_purge(&session->ctrl_transmit);

	skb_queue_purge(&session->intr_transmit);



	if (hid->claimed & HID_CLAIMED_INPUT)

		hidinput_disconnect(hid);

	hid->claimed = 0;

}