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

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

[PATCH] USB Serial: rename usb_serial_device_type to usb_serial_driver 



I'm tired of trying to explain why a "device_type" is really a driver.
This better describes exactly what this structure is.

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

drivers/usb/serial/airprime.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct usb_driver airprime_driver = { 
	.id_table =	id_table,

};



static struct usb_serial_device_type airprime_device = {

static struct usb_serial_driver airprime_device = {

	.owner =		THIS_MODULE,

	.name =			"airprime",

	.id_table =		id_table,

drivers/usb/serial/belkin_sa.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static struct usb_driver belkin_driver = { 
};



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

static struct usb_serial_device_type belkin_device = {

static struct usb_serial_driver belkin_device = {

	.owner =		THIS_MODULE,

	.name =			"Belkin / Peracom / GoHubs USB Serial Adapter",

	.short_name =		"belkin",

drivers/usb/serial/bus.c

+14 −14
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


static int usb_serial_device_match (struct device *dev, struct device_driver *drv)

{

	struct usb_serial_device_type *driver;

	struct usb_serial_driver *driver;

	const struct usb_serial_port *port;



	/*
@@ -44,7 +44,7 @@ struct bus_type usb_serial_bus_type = { 


static int usb_serial_device_probe (struct device *dev)

{

	struct usb_serial_device_type *driver;

	struct usb_serial_driver *driver;

	struct usb_serial_port *port;

	int retval = 0;

	int minor;
@@ -80,7 +80,7 @@ static int usb_serial_device_probe (struct device *dev) 


static int usb_serial_device_remove (struct device *dev)

{

	struct usb_serial_device_type *driver;

	struct usb_serial_driver *driver;

	struct usb_serial_port *port;

	int retval = 0;

	int minor;
@@ -109,26 +109,26 @@ static int usb_serial_device_remove (struct device *dev) 
	return retval;

}



int usb_serial_bus_register(struct usb_serial_device_type *device)

int usb_serial_bus_register(struct usb_serial_driver *driver)

{

	int retval;



	if (device->short_name)

		device->driver.name = (char *)device->short_name;

	if (driver->short_name)

		driver->driver.name = (char *)driver->short_name;

	else

		device->driver.name = (char *)device->name;

	device->driver.bus = &usb_serial_bus_type;

	device->driver.probe = usb_serial_device_probe;

	device->driver.remove = usb_serial_device_remove;

	device->driver.owner = device->owner;

		driver->driver.name = (char *)driver->name;

	driver->driver.bus = &usb_serial_bus_type;

	driver->driver.probe = usb_serial_device_probe;

	driver->driver.remove = usb_serial_device_remove;

	driver->driver.owner = driver->owner;



	retval = driver_register(&device->driver);

	retval = driver_register(&driver->driver);



	return retval;

}



void usb_serial_bus_deregister(struct usb_serial_device_type *device)

void usb_serial_bus_deregister(struct usb_serial_driver *driver)

{

	driver_unregister (&device->driver);

	driver_unregister(&driver->driver);

}

drivers/usb/serial/cp2101.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static struct usb_driver cp2101_driver = { 
	.id_table	= id_table,

};



static struct usb_serial_device_type cp2101_device = {

static struct usb_serial_driver cp2101_device = {

	.owner			= THIS_MODULE,

	.name			= "CP2101",

	.id_table		= id_table,

drivers/usb/serial/cyberjack.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static struct usb_driver cyberjack_driver = { 
	.id_table =	id_table,

};



static struct usb_serial_device_type cyberjack_device = {

static struct usb_serial_driver cyberjack_device = {

	.owner =		THIS_MODULE,

	.name =			"Reiner SCT Cyberjack USB card reader",

	.short_name =		"cyberjack",