apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] USB Serial: rename usb_serial_device_type to usb_serial_driver

Browse Source 
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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
2005-06-20 21:15:16 -07:00
parent a6c82600d4
commit ea65370d02
31 changed files with 85 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usb/serial/airprime.c
+1 -1
View File
@@ -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
View File
@@ -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
View File
@@ -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 @@ exit:
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 @@ exit:
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
View File
@@ -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
View File
@@ -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",
drivers/usb/serial/cypress_m8.c
+2 -2
View File
@@ -176,7 +176,7 @@ static unsigned int cypress_buf_put(struct cypress_buf *cb, const char *buf, u
static unsigned int cypress_buf_get(struct cypress_buf *cb, char *buf, unsigned int count);
static struct usb_serial_device_type cypress_earthmate_device = {
static struct usb_serial_driver cypress_earthmate_device = {
.owner = THIS_MODULE,
.name = "DeLorme Earthmate USB",
.short_name = "earthmate",
@@ -203,7 +203,7 @@ static struct usb_serial_device_type cypress_earthmate_device = {
.write_int_callback = cypress_write_int_callback,
};
static struct usb_serial_device_type cypress_hidcom_device = {
static struct usb_serial_driver cypress_hidcom_device = {
.owner = THIS_MODULE,
.name = "HID->COM RS232 Adapter",
.short_name = "cyphidcom",
drivers/usb/serial/digi_acceleport.c
+2 -2
View File
@@ -503,7 +503,7 @@ static struct usb_driver digi_driver = {
/* device info needed for the Digi serial converter */
static struct usb_serial_device_type digi_acceleport_2_device = {
static struct usb_serial_driver digi_acceleport_2_device = {
.owner = THIS_MODULE,
.name = "Digi 2 port USB adapter",
.short_name = "digi_2",
@@ -530,7 +530,7 @@ static struct usb_serial_device_type digi_acceleport_2_device = {
.shutdown = digi_shutdown,
};
static struct usb_serial_device_type digi_acceleport_4_device = {
static struct usb_serial_driver digi_acceleport_4_device = {
.owner = THIS_MODULE,
.name = "Digi 4 port USB adapter",
.short_name = "digi_4",
drivers/usb/serial/empeg.c
+1 -1
View File
@@ -112,7 +112,7 @@ static struct usb_driver empeg_driver = {
.id_table = id_table,
};
static struct usb_serial_device_type empeg_device = {
static struct usb_serial_driver empeg_device = {
.owner = THIS_MODULE,
.name = "Empeg",
.id_table = id_table,
drivers/usb/serial/ftdi_sio.c
+1 -1
View File
@@ -562,7 +562,7 @@ static unsigned short int ftdi_232am_baud_to_divisor (int baud);
static __u32 ftdi_232bm_baud_base_to_divisor (int baud, int base);
static __u32 ftdi_232bm_baud_to_divisor (int baud);
static struct usb_serial_device_type ftdi_sio_device = {
static struct usb_serial_driver ftdi_sio_device = {
.owner = THIS_MODULE,
.name = "FTDI USB Serial Device",
.short_name = "ftdi_sio",
drivers/usb/serial/garmin_gps.c
+1 -6
View File
@@ -1468,13 +1468,8 @@ static void garmin_shutdown (struct usb_serial *serial)
}
/* All of the device info needed */
static struct usb_serial_device_type garmin_device = {
static struct usb_serial_driver garmin_device = {
.owner = THIS_MODULE,
.name = "Garmin GPS usb/tty",
.short_name = "garmin_gps",
drivers/usb/serial/generic.c
+1 -1
View File
@@ -36,7 +36,7 @@ MODULE_PARM_DESC(product, "User specified USB idProduct");
static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
/* All of the device info needed for the Generic Serial Converter */
struct usb_serial_device_type usb_serial_generic_device = {
struct usb_serial_driver usb_serial_generic_device = {
.owner = THIS_MODULE,
.name = "Generic",
.short_name = "generic",
drivers/usb/serial/hp4x.c
+1 -1
View File
@@ -44,7 +44,7 @@ static struct usb_driver hp49gp_driver = {
.id_table = id_table,
};
static struct usb_serial_device_type hp49gp_device = {
static struct usb_serial_driver hp49gp_device = {
.owner = THIS_MODULE,
.name = "HP4X",
.id_table = id_table,
drivers/usb/serial/io_tables.h
+3 -3
View File
@@ -75,7 +75,7 @@ static struct usb_device_id id_table_combined [] = {
MODULE_DEVICE_TABLE (usb, id_table_combined);
static struct usb_serial_device_type edgeport_2port_device = {
static struct usb_serial_driver edgeport_2port_device = {
.owner = THIS_MODULE,
.name = "Edgeport 2 port adapter",
.short_name = "edgeport_2",
@@ -103,7 +103,7 @@ static struct usb_serial_device_type edgeport_2port_device = {
.write_bulk_callback = edge_bulk_out_data_callback,
};
static struct usb_serial_device_type edgeport_4port_device = {
static struct usb_serial_driver edgeport_4port_device = {
.owner = THIS_MODULE,
.name = "Edgeport 4 port adapter",
.short_name = "edgeport_4",
@@ -131,7 +131,7 @@ static struct usb_serial_device_type edgeport_4port_device = {
.write_bulk_callback = edge_bulk_out_data_callback,
};
static struct usb_serial_device_type edgeport_8port_device = {
static struct usb_serial_driver edgeport_8port_device = {
.owner = THIS_MODULE,
.name = "Edgeport 8 port adapter",
.short_name = "edgeport_8",
drivers/usb/serial/io_ti.c
+2 -2
View File
@@ -2982,7 +2982,7 @@ static unsigned int edge_buf_get(struct edge_buf *eb, char *buf,
}
static struct usb_serial_device_type edgeport_1port_device = {
static struct usb_serial_driver edgeport_1port_device = {
.owner = THIS_MODULE,
.name = "Edgeport TI 1 port adapter",
.short_name = "edgeport_ti_1",
@@ -3010,7 +3010,7 @@ static struct usb_serial_device_type edgeport_1port_device = {
.write_bulk_callback = edge_bulk_out_callback,
};
static struct usb_serial_device_type edgeport_2port_device = {
static struct usb_serial_driver edgeport_2port_device = {
.owner = THIS_MODULE,
.name = "Edgeport TI 2 port adapter",
.short_name = "edgeport_ti_2",
drivers/usb/serial/ipaq.c
+1 -1
View File
@@ -547,7 +547,7 @@ static struct usb_driver ipaq_driver = {
/* All of the device info needed for the Compaq iPAQ */
static struct usb_serial_device_type ipaq_device = {
static struct usb_serial_driver ipaq_device = {
.owner = THIS_MODULE,
.name = "PocketPC PDA",
.id_table = ipaq_id_table,
drivers/usb/serial/ipw.c
+1 -1
View File
@@ -443,7 +443,7 @@ static int ipw_disconnect(struct usb_serial_port *port)
return 0;
}
static struct usb_serial_device_type ipw_device = {
static struct usb_serial_driver ipw_device = {
.owner = THIS_MODULE,
.name = "IPWireless converter",
.short_name = "ipw",
drivers/usb/serial/ir-usb.c
+1 -1
View File
@@ -133,7 +133,7 @@ static struct usb_driver ir_driver = {
};
static struct usb_serial_device_type ir_device = {
static struct usb_serial_driver ir_device = {
.owner = THIS_MODULE,
.name = "IR Dongle",
.id_table = id_table,
drivers/usb/serial/keyspan.h
+4 -4
View File
@@ -570,7 +570,7 @@ static struct usb_device_id keyspan_4port_ids[] = {
};
/* Structs for the devices, pre and post renumeration. */
static struct usb_serial_device_type keyspan_pre_device = {
static struct usb_serial_driver keyspan_pre_device = {
.owner = THIS_MODULE,
.name = "Keyspan - (without firmware)",
.short_name = "keyspan_no_firm",
@@ -582,7 +582,7 @@ static struct usb_serial_device_type keyspan_pre_device = {
.attach = keyspan_fake_startup,
};
static struct usb_serial_device_type keyspan_1port_device = {
static struct usb_serial_driver keyspan_1port_device = {
.owner = THIS_MODULE,
.name = "Keyspan 1 port adapter",
.short_name = "keyspan_1",
@@ -607,7 +607,7 @@ static struct usb_serial_device_type keyspan_1port_device = {
.shutdown = keyspan_shutdown,
};
static struct usb_serial_device_type keyspan_2port_device = {
static struct usb_serial_driver keyspan_2port_device = {
.owner = THIS_MODULE,
.name = "Keyspan 2 port adapter",
.short_name = "keyspan_2",
@@ -632,7 +632,7 @@ static struct usb_serial_device_type keyspan_2port_device = {
.shutdown = keyspan_shutdown,
};
static struct usb_serial_device_type keyspan_4port_device = {
static struct usb_serial_driver keyspan_4port_device = {
.owner = THIS_MODULE,
.name = "Keyspan 4 port adapter",
.short_name = "keyspan_4",
drivers/usb/serial/keyspan_pda.c
+3 -3
View File
@@ -783,7 +783,7 @@ static void keyspan_pda_shutdown (struct usb_serial *serial)
}
#ifdef KEYSPAN
static struct usb_serial_device_type keyspan_pda_fake_device = {
static struct usb_serial_driver keyspan_pda_fake_device = {
.owner = THIS_MODULE,
.name = "Keyspan PDA - (prerenumeration)",
.short_name = "keyspan_pda_pre",
@@ -797,7 +797,7 @@ static struct usb_serial_device_type keyspan_pda_fake_device = {
#endif
#ifdef XIRCOM
static struct usb_serial_device_type xircom_pgs_fake_device = {
static struct usb_serial_driver xircom_pgs_fake_device = {
.owner = THIS_MODULE,
.name = "Xircom / Entregra PGS - (prerenumeration)",
.short_name = "xircom_no_firm",
@@ -810,7 +810,7 @@ static struct usb_serial_device_type xircom_pgs_fake_device = {
};
#endif
static struct usb_serial_device_type keyspan_pda_device = {
static struct usb_serial_driver keyspan_pda_device = {
.owner = THIS_MODULE,
.name = "Keyspan PDA",
.short_name = "keyspan_pda",
drivers/usb/serial/kl5kusb105.c
+1 -1
View File
@@ -123,7 +123,7 @@ static struct usb_driver kl5kusb105d_driver = {
.id_table = id_table,
};
static struct usb_serial_device_type kl5kusb105d_device = {
static struct usb_serial_driver kl5kusb105d_device = {
.owner = THIS_MODULE,
.name = "KL5KUSB105D / PalmConnect",
.short_name = "kl5kusb105d",

Some files were not shown because too many files have changed in this diff Show More