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

Commit ba9dc657 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

[PATCH] USB: allow usb drivers to disable dynamic ids 



This lets drivers, like the usb-serial ones, disable the ability to add
ids from sysfs.

The usb-serial drivers are "odd" in that they are really usb-serial bus
drivers, not usb bus drivers, so the dynamic id logic will have to go
into the usb-serial bus core for those drivers to get that ability.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 733260ff

drivers/usb/core/driver.c

+19 −0
Original line number Diff line number Diff line
@@ -112,12 +112,26 @@ static int usb_create_newid_file(struct usb_driver *usb_drv) 
{

	int error = 0;



	if (usb_drv->no_dynamic_id)

		goto exit;



	if (usb_drv->probe != NULL)

		error = sysfs_create_file(&usb_drv->driver.kobj,

					  &driver_attr_new_id.attr);

exit:

	return error;

}



static void usb_remove_newid_file(struct usb_driver *usb_drv)

{

	if (usb_drv->no_dynamic_id)

		return;



	if (usb_drv->probe != NULL)

		sysfs_remove_file(&usb_drv->driver.kobj,

				  &driver_attr_new_id.attr);

}



static void usb_free_dynids(struct usb_driver *usb_drv)

{

	struct usb_dynid *dynid, *n;
@@ -135,6 +149,10 @@ static inline int usb_create_newid_file(struct usb_driver *usb_drv) 
	return 0;

}



static void usb_remove_newid_file(struct usb_driver *usb_drv)

{

}



static inline void usb_free_dynids(struct usb_driver *usb_drv)

{

}
@@ -447,6 +465,7 @@ void usb_deregister(struct usb_driver *driver) 
	pr_info("%s: deregistering driver %s\n", usbcore_name, driver->name);



	usb_lock_all_devices();

	usb_remove_newid_file(driver);

	usb_free_dynids(driver);

	driver_unregister(&driver->driver);

	usb_unlock_all_devices();

drivers/usb/serial/airprime.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static struct usb_driver airprime_driver = { 
	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table,

	.no_dynamic_id = 	1,

};



static struct usb_serial_driver airprime_device = {

drivers/usb/serial/anydata.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ static struct usb_driver anydata_driver = { 
	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table,

	.no_dynamic_id = 	1,

};



static int anydata_open(struct usb_serial_port *port, struct file *filp)

drivers/usb/serial/belkin_sa.c

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ static struct usb_driver belkin_driver = { 
	.probe =	usb_serial_probe,

	.disconnect =	usb_serial_disconnect,

	.id_table =	id_table_combined,

	.no_dynamic_id = 	1,

};



/* All of the device info needed for the serial converters */

drivers/usb/serial/cp2101.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static struct usb_driver cp2101_driver = { 
	.probe		= usb_serial_probe,

	.disconnect	= usb_serial_disconnect,

	.id_table	= id_table,

	.no_dynamic_id	= 	1,

};



static struct usb_serial_driver cp2101_device = {