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

Commit c17a7476 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: core: rewrite the hid-generic automatic unbind 



We actually can have the unbind/rebind logic in hid-core.c, leaving
only the match function in hid-generic.

This makes hid-generic simpler and the whole logic simpler too.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 001fab49

drivers/hid/hid-core.c

+24 −11
Original line number Diff line number Diff line
@@ -2197,31 +2197,40 @@ void hid_destroy_device(struct hid_device *hdev) 
EXPORT_SYMBOL_GPL(hid_destroy_device);





static int __bus_add_driver(struct device_driver *drv, void *data)

static int __hid_bus_reprobe_drivers(struct device *dev, void *data)

{

	struct hid_driver *added_hdrv = data;

	struct hid_driver *hdrv = to_hid_driver(drv);

	struct hid_driver *hdrv = data;

	struct hid_device *hdev = to_hid_device(dev);



	if (hdrv->bus_add_driver)

		hdrv->bus_add_driver(added_hdrv);

	if (hdev->driver == hdrv &&

	    !hdrv->match(hdev, hid_ignore_special_drivers))

		return device_reprobe(dev);



	return 0;

}



static int __bus_removed_driver(struct device_driver *drv, void *data)

static int __hid_bus_driver_added(struct device_driver *drv, void *data)

{

	struct hid_driver *removed_hdrv = data;

	struct hid_driver *hdrv = to_hid_driver(drv);



	if (hdrv->bus_removed_driver)

		hdrv->bus_removed_driver(removed_hdrv);

	if (hdrv->match) {

		bus_for_each_dev(&hid_bus_type, NULL, hdrv,

				 __hid_bus_reprobe_drivers);

	}



	return 0;

}



static int __bus_removed_driver(struct device_driver *drv, void *data)

{

	return bus_rescan_devices(&hid_bus_type);

}



int __hid_register_driver(struct hid_driver *hdrv, struct module *owner,

		const char *mod_name)

{

	int ret;



	hdrv->driver.name = hdrv->name;

	hdrv->driver.bus = &hid_bus_type;

	hdrv->driver.owner = owner;
@@ -2230,9 +2239,13 @@ int __hid_register_driver(struct hid_driver *hdrv, struct module *owner, 
	INIT_LIST_HEAD(&hdrv->dyn_list);

	spin_lock_init(&hdrv->dyn_lock);



	bus_for_each_drv(&hid_bus_type, NULL, hdrv, __bus_add_driver);

	ret = driver_register(&hdrv->driver);



	if (ret == 0)

		bus_for_each_drv(&hid_bus_type, NULL, NULL,

				 __hid_bus_driver_added);



	return driver_register(&hdrv->driver);

	return ret;

}

EXPORT_SYMBOL_GPL(__hid_register_driver);

drivers/hid/hid-generic.c

+0 −33
Original line number Diff line number Diff line
@@ -26,37 +26,6 @@ 


static struct hid_driver hid_generic;



static int __unmap_hid_generic(struct device *dev, void *data)

{

	struct hid_driver *hdrv = data;

	struct hid_device *hdev = to_hid_device(dev);



	/* only unbind matching devices already bound to hid-generic */

	if (hdev->driver != &hid_generic ||

	    hid_match_device(hdev, hdrv) == NULL)

		return 0;



	if (dev->parent)	/* Needed for USB */

		device_lock(dev->parent);

	device_release_driver(dev);

	if (dev->parent)

		device_unlock(dev->parent);



	return 0;

}



static void hid_generic_add_driver(struct hid_driver *hdrv)

{

	bus_for_each_dev(&hid_bus_type, NULL, hdrv, __unmap_hid_generic);

}



static void hid_generic_removed_driver(struct hid_driver *hdrv)

{

	int ret;



	ret = driver_attach(&hid_generic.driver);

}



static int __check_hid_generic(struct device_driver *drv, void *data)

{

	struct hid_driver *hdrv = to_hid_driver(drv);
@@ -97,8 +66,6 @@ static struct hid_driver hid_generic = { 
	.name = "hid-generic",

	.id_table = hid_table,

	.match = hid_generic_match,

	.bus_add_driver = hid_generic_add_driver,

	.bus_removed_driver = hid_generic_removed_driver,

};

module_hid_driver(hid_generic);

include/linux/hid.h

+0 −4
Original line number Diff line number Diff line
@@ -686,8 +686,6 @@ struct hid_usage_id { 
 * @input_mapped: invoked on input registering after mapping an usage

 * @input_configured: invoked just before the device is registered

 * @feature_mapping: invoked on feature registering

 * @bus_add_driver: invoked when a HID driver is about to be added

 * @bus_removed_driver: invoked when a HID driver has been removed

 * @suspend: invoked on suspend (NULL means nop)

 * @resume: invoked on resume if device was not reset (NULL means nop)

 * @reset_resume: invoked on resume if device was reset (NULL means nop)
@@ -742,8 +740,6 @@ struct hid_driver { 
	void (*feature_mapping)(struct hid_device *hdev,

			struct hid_field *field,

			struct hid_usage *usage);

	void (*bus_add_driver)(struct hid_driver *driver);

	void (*bus_removed_driver)(struct hid_driver *driver);

#ifdef CONFIG_PM

	int (*suspend)(struct hid_device *hdev, pm_message_t message);

	int (*resume)(struct hid_device *hdev);