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

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

[PATCH] USB Serial: get rid of the .owner field in usb_serial_driver 



Don't duplicate something that's already in struct driver.

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

drivers/usb/serial/airprime.c

+3 −1
Original line number Diff line number Diff line
@@ -31,7 +31,9 @@ static struct usb_driver airprime_driver = { 
};



static struct usb_serial_driver airprime_device = {

	.driver = {

		.owner =	THIS_MODULE,

	},

	.name =			"airprime",

	.id_table =		id_table,

	.num_interrupt_in =	NUM_DONT_CARE,

drivers/usb/serial/belkin_sa.c

+3 −1
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ static struct usb_driver belkin_driver = { 


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

static struct usb_serial_driver belkin_device = {

	.driver = {

		.owner =	THIS_MODULE,

	},

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

	.short_name =		"belkin",

	.id_table =		id_table_combined,

drivers/usb/serial/bus.c

+4 −5
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ static int usb_serial_device_probe (struct device *dev) 


	driver = port->serial->type;

	if (driver->port_probe) {

		if (!try_module_get(driver->owner)) {

		if (!try_module_get(driver->driver.owner)) {

			dev_err(dev, "module get failed, exiting\n");

			retval = -EIO;

			goto exit;

		}

		retval = driver->port_probe (port);

		module_put(driver->owner);

		module_put(driver->driver.owner);

		if (retval)

			goto exit;

	}
@@ -92,13 +92,13 @@ static int usb_serial_device_remove (struct device *dev) 


	driver = port->serial->type;

	if (driver->port_remove) {

		if (!try_module_get(driver->owner)) {

		if (!try_module_get(driver->driver.owner)) {

			dev_err(dev, "module get failed, exiting\n");

			retval = -EIO;

			goto exit;

		}

		retval = driver->port_remove (port);

		module_put(driver->owner);

		module_put(driver->driver.owner);

	}

exit:

	minor = port->number;
@@ -120,7 +120,6 @@ int usb_serial_bus_register(struct usb_serial_driver *driver) 
	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(&driver->driver);

drivers/usb/serial/cp2101.c

+3 −1
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ static struct usb_driver cp2101_driver = { 
};



static struct usb_serial_driver cp2101_device = {

	.driver = {

		.owner =	THIS_MODULE,

	},

	.name			= "CP2101",

	.id_table		= id_table,

	.num_interrupt_in	= 0,

drivers/usb/serial/cyberjack.c

+3 −1
Original line number Diff line number Diff line
@@ -84,7 +84,9 @@ static struct usb_driver cyberjack_driver = { 
};



static struct usb_serial_driver cyberjack_device = {

	.driver = {

		.owner =	THIS_MODULE,

	},

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

	.short_name =		"cyberjack",

	.id_table =		id_table,