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

Commit 50bb6d84 authored by Alan Stern's avatar Alan Stern Committed by Jiri Kosina
Browse files

HID: usbhid: remove unused hiddev_driver 



Now that hiddev_driver isn't being used for anything, there's no
reason to keep it around.  This patch (as1419) gets rid of it
entirely.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 73e6d6c6

drivers/hid/usbhid/hid-core.c

+0 −6
Original line number Diff line number Diff line
@@ -1470,9 +1470,6 @@ static int __init hid_init(void) 
	retval = usbhid_quirks_init(quirks_param);

	if (retval)

		goto usbhid_quirks_init_fail;

	retval = hiddev_init();

	if (retval)

		goto hiddev_init_fail;

	retval = usb_register(&hid_driver);

	if (retval)

		goto usb_register_fail;
@@ -1480,8 +1477,6 @@ static int __init hid_init(void) 


	return 0;

usb_register_fail:

	hiddev_exit();

hiddev_init_fail:

	usbhid_quirks_exit();

usbhid_quirks_init_fail:

	hid_unregister_driver(&hid_usb_driver);
@@ -1494,7 +1489,6 @@ static int __init hid_init(void) 
static void __exit hid_exit(void)

{

	usb_deregister(&hid_driver);

	hiddev_exit();

	usbhid_quirks_exit();

	hid_unregister_driver(&hid_usb_driver);

	destroy_workqueue(resumption_waker);

drivers/hid/usbhid/hiddev.c

+0 −40
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ struct hiddev_list { 
	struct mutex thread_lock;

};



static struct usb_driver hiddev_driver;



/*

 * Find a report, given the report's type and ID.  The ID can be specified

 * indirectly by REPORT_ID_FIRST (which returns the first report of the given
@@ -925,41 +923,3 @@ void hiddev_disconnect(struct hid_device *hid) 
		kfree(hiddev);

	}

}
 


/* Currently this driver is a USB driver.  It's not a conventional one in

 * the sense that it doesn't probe at the USB level.  Instead it waits to

 * be connected by HID through the hiddev_connect / hiddev_disconnect

 * routines.  The reason to register as a USB device is to gain part of the

 * minor number space from the USB major.

 *

 * In theory, should the HID code be generalized to more than one physical

 * medium (say, IEEE 1384), this driver will probably need to register its

 * own major number, and in doing so, no longer need to register with USB.

 * At that point the probe routine and hiddev_driver struct below will no

 * longer be useful.

 */





/* We never attach in this manner, and rely on HID to connect us.  This

 * is why there is no disconnect routine defined in the usb_driver either.

 */

static int hiddev_usbd_probe(struct usb_interface *intf,

			     const struct usb_device_id *hiddev_info)

{

	return -ENODEV;

}



static /* const */ struct usb_driver hiddev_driver = {

	.name =		"hiddev",

	.probe =	hiddev_usbd_probe,

};



int __init hiddev_init(void)

{

	return usb_register(&hiddev_driver);

}



void hiddev_exit(void)

{

	usb_deregister(&hiddev_driver);

}

include/linux/hiddev.h

+0 −4
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ void hiddev_disconnect(struct hid_device *); 
void hiddev_hid_event(struct hid_device *hid, struct hid_field *field,

		      struct hid_usage *usage, __s32 value);

void hiddev_report_event(struct hid_device *hid, struct hid_report *report);

int __init hiddev_init(void);

void hiddev_exit(void);

#else

static inline int hiddev_connect(struct hid_device *hid,

		unsigned int force)
@@ -236,8 +234,6 @@ static inline void hiddev_disconnect(struct hid_device *hid) { } 
static inline void hiddev_hid_event(struct hid_device *hid, struct hid_field *field,

		      struct hid_usage *usage, __s32 value) { }

static inline void hiddev_report_event(struct hid_device *hid, struct hid_report *report) { }

static inline int hiddev_init(void) { return 0; }

static inline void hiddev_exit(void) { }

#endif



#endif