---

yaml
---
r: 10814
b: refs/heads/master
c: 269bda1
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 502b95c1cc9e2c855a26f90fc999c5211b8ba957
+refs/heads/master: 269bda1c123c7caf88e1deb2264f9086f0344192

trunk/drivers/usb/serial/airprime.c

@@ -33,8 +33,8 @@ static struct usb_driver airprime_driver = {
 static struct usb_serial_driver airprime_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"airprime",
 	},
-	.name =			"airprime",
 	.id_table =		id_table,
 	.num_interrupt_in =	NUM_DONT_CARE,
 	.num_bulk_in =		NUM_DONT_CARE,

trunk/drivers/usb/serial/belkin_sa.c

@@ -124,9 +124,9 @@ static struct usb_driver belkin_driver = {
 static struct usb_serial_driver belkin_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"belkin",
 	},
-	.name =			"Belkin / Peracom / GoHubs USB Serial Adapter",
-	.short_name =		"belkin",
+	.description =		"Belkin / Peracom / GoHubs USB Serial Adapter",
 	.id_table =		id_table_combined,
 	.num_interrupt_in =	1,
 	.num_bulk_in =		1,

trunk/drivers/usb/serial/bus.c

@@ -72,7 +72,7 @@ static int usb_serial_device_probe (struct device *dev)
 	tty_register_device (usb_serial_tty_driver, minor, dev);
 	dev_info(&port->serial->dev->dev, 
 		 "%s converter now attached to ttyUSB%d\n",
-		 driver->name, minor);
+		 driver->description, minor);
 
 exit:
 	return retval;
@@ -104,7 +104,7 @@ static int usb_serial_device_remove (struct device *dev)
 	minor = port->number;
 	tty_unregister_device (usb_serial_tty_driver, minor);
 	dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
-		 driver->name, minor);
+		 driver->description, minor);
 
 	return retval;
 }
@@ -113,10 +113,6 @@ int usb_serial_bus_register(struct usb_serial_driver *driver)
 {
 	int retval;
 
-	if (driver->short_name)
-		driver->driver.name = (char *)driver->short_name;
-	else
-		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;

trunk/drivers/usb/serial/cp2101.c

@@ -67,7 +67,7 @@ MODULE_DEVICE_TABLE (usb, id_table);
 
 static struct usb_driver cp2101_driver = {
 	.owner		= THIS_MODULE,
-	.name		= "CP2101",
+	.name		= "cp2101",
 	.probe		= usb_serial_probe,
 	.disconnect	= usb_serial_disconnect,
 	.id_table	= id_table,
@@ -76,8 +76,8 @@ static struct usb_driver cp2101_driver = {
 static struct usb_serial_driver cp2101_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name = 	"cp2101",
 	},
-	.name			= "CP2101",
 	.id_table		= id_table,
 	.num_interrupt_in	= 0,
 	.num_bulk_in		= 0,

trunk/drivers/usb/serial/cyberjack.c

@@ -86,9 +86,9 @@ static struct usb_driver cyberjack_driver = {
 static struct usb_serial_driver cyberjack_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"cyberjack",
 	},
-	.name =			"Reiner SCT Cyberjack USB card reader",
-	.short_name =		"cyberjack",
+	.description =		"Reiner SCT Cyberjack USB card reader",
 	.id_table =		id_table,
 	.num_interrupt_in =	1,
 	.num_bulk_in =		1,

trunk/drivers/usb/serial/cypress_m8.c

@@ -179,9 +179,9 @@ static unsigned int	  cypress_buf_get(struct cypress_buf *cb, char *buf, unsigne
 static struct usb_serial_driver cypress_earthmate_device = {
 	.driver = {
 		.owner =		THIS_MODULE,
+		.name =			"earthmate",
 	},
-	.name =				"DeLorme Earthmate USB",
-	.short_name =			"earthmate",
+	.description =			"DeLorme Earthmate USB",
 	.id_table =			id_table_earthmate,
 	.num_interrupt_in = 		1,
 	.num_interrupt_out =		1,
@@ -208,9 +208,9 @@ static struct usb_serial_driver cypress_earthmate_device = {
 static struct usb_serial_driver cypress_hidcom_device = {
 	.driver = {
 		.owner =		THIS_MODULE,
+		.name =			"cyphidcom",
 	},
-	.name =				"HID->COM RS232 Adapter",
-	.short_name =			"cyphidcom",
+	.description =			"HID->COM RS232 Adapter",
 	.id_table =			id_table_cyphidcomrs232,
 	.num_interrupt_in =		1,
 	.num_interrupt_out =		1,

trunk/drivers/usb/serial/digi_acceleport.c

@@ -505,10 +505,10 @@ static struct usb_driver digi_driver = {
 
 static struct usb_serial_driver digi_acceleport_2_device = {
 	.driver = {
-		.owner =	THIS_MODULE,
+		.owner =		THIS_MODULE,
+		.name =			"digi_2",
 	},
-	.name =				"Digi 2 port USB adapter",
-	.short_name =			"digi_2",
+	.description =			"Digi 2 port USB adapter",
 	.id_table =			id_table_2,
 	.num_interrupt_in =		0,
 	.num_bulk_in =			4,
@@ -534,10 +534,10 @@ static struct usb_serial_driver digi_acceleport_2_device = {
 
 static struct usb_serial_driver digi_acceleport_4_device = {
 	.driver = {
-		.owner =	THIS_MODULE,
+		.owner =		THIS_MODULE,
+		.name =			"digi_4",
 	},
-	.name =				"Digi 4 port USB adapter",
-	.short_name =			"digi_4",
+	.description =			"Digi 4 port USB adapter",
 	.id_table =			id_table_4,
 	.num_interrupt_in =		0,
 	.num_bulk_in =			5,

trunk/drivers/usb/serial/empeg.c

@@ -115,8 +115,8 @@ static struct usb_driver empeg_driver = {
 static struct usb_serial_driver empeg_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"empeg",
 	},
-	.name =			"Empeg",
 	.id_table =		id_table,
 	.num_interrupt_in =	0,
 	.num_bulk_in =		1,

trunk/drivers/usb/serial/ftdi_sio.c

@@ -565,9 +565,9 @@ static __u32 ftdi_232bm_baud_to_divisor (int baud);
 static struct usb_serial_driver ftdi_sio_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"ftdi_sio",
 	},
-	.name =			"FTDI USB Serial Device",
-	.short_name =		"ftdi_sio",
+	.description =		"FTDI USB Serial Device",
 	.id_table =		id_table_combined,
 	.num_interrupt_in =	0,
 	.num_bulk_in =		1,

trunk/drivers/usb/serial/garmin_gps.c

@@ -1472,9 +1472,9 @@ static void garmin_shutdown (struct usb_serial *serial)
 static struct usb_serial_driver garmin_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"garmin_gps",
 	},
-	.name                = "Garmin GPS usb/tty",
-	.short_name          = "garmin_gps",
+	.description =		"Garmin GPS usb/tty",
 	.id_table            = id_table,
 	.num_interrupt_in    = 1,
 	.num_bulk_in         = 1,

trunk/drivers/usb/serial/generic.c

@@ -39,9 +39,8 @@ static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
 struct usb_serial_driver usb_serial_generic_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"generic",
 	},
-	.name =			"Generic",
-	.short_name =		"generic",
 	.id_table =		generic_device_ids,
 	.num_interrupt_in =	NUM_DONT_CARE,
 	.num_bulk_in =		NUM_DONT_CARE,

trunk/drivers/usb/serial/hp4x.c

@@ -38,7 +38,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
 
 static struct usb_driver hp49gp_driver = {
 	.owner =	THIS_MODULE,
-	.name =		"HP4X",
+	.name =		"hp4X",
 	.probe =	usb_serial_probe,
 	.disconnect =	usb_serial_disconnect,
 	.id_table =	id_table,
@@ -47,8 +47,8 @@ static struct usb_driver hp49gp_driver = {
 static struct usb_serial_driver hp49gp_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"hp4X",
 	},
-	.name =			"HP4X",
 	.id_table =		id_table,
 	.num_interrupt_in =	NUM_DONT_CARE,
 	.num_bulk_in =		NUM_DONT_CARE,

trunk/drivers/usb/serial/io_tables.h

@@ -78,9 +78,9 @@ MODULE_DEVICE_TABLE (usb, id_table_combined);
 static struct usb_serial_driver edgeport_2port_device = {
 	.driver = {
 		.owner		= THIS_MODULE,
+		.name		= "edgeport_2",
 	},
-	.name			= "Edgeport 2 port adapter",
-	.short_name		= "edgeport_2",
+	.description		= "Edgeport 2 port adapter",
 	.id_table		= edgeport_2port_id_table,
 	.num_interrupt_in	= 1,
 	.num_bulk_in		= 1,
@@ -108,9 +108,9 @@ static struct usb_serial_driver edgeport_2port_device = {
 static struct usb_serial_driver edgeport_4port_device = {
 	.driver = {
 		.owner		= THIS_MODULE,
+		.name		= "edgeport_4",
 	},
-	.name			= "Edgeport 4 port adapter",
-	.short_name		= "edgeport_4",
+	.description		= "Edgeport 4 port adapter",
 	.id_table		= edgeport_4port_id_table,
 	.num_interrupt_in	= 1,
 	.num_bulk_in		= 1,
@@ -138,9 +138,9 @@ static struct usb_serial_driver edgeport_4port_device = {
 static struct usb_serial_driver edgeport_8port_device = {
 	.driver = {
 		.owner		= THIS_MODULE,
+		.name		= "edgeport_8",
 	},
-	.name			= "Edgeport 8 port adapter",
-	.short_name		= "edgeport_8",
+	.description		= "Edgeport 8 port adapter",
 	.id_table		= edgeport_8port_id_table,
 	.num_interrupt_in	= 1,
 	.num_bulk_in		= 1,

trunk/drivers/usb/serial/io_ti.c

@@ -2984,10 +2984,10 @@ static unsigned int edge_buf_get(struct edge_buf *eb, char *buf,
 
 static struct usb_serial_driver edgeport_1port_device = {
 	.driver = {
-		.owner =	THIS_MODULE,
+		.owner		= THIS_MODULE,
+		.name		= "edgeport_ti_1",
 	},
-	.name			= "Edgeport TI 1 port adapter",
-	.short_name		= "edgeport_ti_1",
+	.description		= "Edgeport TI 1 port adapter",
 	.id_table		= edgeport_1port_id_table,
 	.num_interrupt_in	= 1,
 	.num_bulk_in		= 1,
@@ -3014,10 +3014,10 @@ static struct usb_serial_driver edgeport_1port_device = {
 
 static struct usb_serial_driver edgeport_2port_device = {
 	.driver = {
-		.owner =	THIS_MODULE,
+		.owner		= THIS_MODULE,
+		.name		= "edgeport_ti_2",
 	},
-	.name			= "Edgeport TI 2 port adapter",
-	.short_name		= "edgeport_ti_2",
+	.description		= "Edgeport TI 2 port adapter",
 	.id_table		= edgeport_2port_id_table,
 	.num_interrupt_in	= 1,
 	.num_bulk_in		= 2,

trunk/drivers/usb/serial/ipaq.c

@@ -550,8 +550,9 @@ static struct usb_driver ipaq_driver = {
 static struct usb_serial_driver ipaq_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"ipaq",
 	},
-	.name =			"PocketPC PDA",
+	.description =		"PocketPC PDA",
 	.id_table =		ipaq_id_table,
 	.num_interrupt_in =	NUM_DONT_CARE,
 	.num_bulk_in =		1,

trunk/drivers/usb/serial/ipw.c

@@ -446,9 +446,9 @@ static int ipw_disconnect(struct usb_serial_port *port)
 static struct usb_serial_driver ipw_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"ipw",
 	},
-	.name =			"IPWireless converter",
-	.short_name =		"ipw",
+	.description =		"IPWireless converter",
 	.id_table =		usb_ipw_ids,
 	.num_interrupt_in =	NUM_DONT_CARE,
 	.num_bulk_in =		1,

trunk/drivers/usb/serial/ir-usb.c

@@ -136,8 +136,9 @@ static struct usb_driver ir_driver = {
 static struct usb_serial_driver ir_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"ir-usb",
 	},
-	.name =			"IR Dongle",
+	.description =		"IR Dongle",
 	.id_table =		id_table,
 	.num_interrupt_in =	1,
 	.num_bulk_in =		1,

trunk/drivers/usb/serial/keyspan.h

@@ -573,9 +573,9 @@ static struct usb_device_id keyspan_4port_ids[] = {
 static struct usb_serial_driver keyspan_pre_device = {
 	.driver = {
 		.owner		= THIS_MODULE,
+		.name		= "keyspan_no_firm",
 	},
-	.name			= "Keyspan - (without firmware)",
-	.short_name		= "keyspan_no_firm",
+	.description		= "Keyspan - (without firmware)",
 	.id_table		= keyspan_pre_ids,
 	.num_interrupt_in	= NUM_DONT_CARE,
 	.num_bulk_in		= NUM_DONT_CARE,
@@ -587,9 +587,9 @@ static struct usb_serial_driver keyspan_pre_device = {
 static struct usb_serial_driver keyspan_1port_device = {
 	.driver = {
 		.owner		= THIS_MODULE,
+		.name		= "keyspan_1",
 	},
-	.name			= "Keyspan 1 port adapter",
-	.short_name		= "keyspan_1",
+	.description		= "Keyspan 1 port adapter",
 	.id_table		= keyspan_1port_ids,
 	.num_interrupt_in	= NUM_DONT_CARE,
 	.num_bulk_in		= NUM_DONT_CARE,
@@ -614,9 +614,9 @@ static struct usb_serial_driver keyspan_1port_device = {
 static struct usb_serial_driver keyspan_2port_device = {
 	.driver = {
 		.owner		= THIS_MODULE,
+		.name		= "keyspan_2",
 	},
-	.name			= "Keyspan 2 port adapter",
-	.short_name		= "keyspan_2",
+	.description		= "Keyspan 2 port adapter",
 	.id_table		= keyspan_2port_ids,
 	.num_interrupt_in	= NUM_DONT_CARE,
 	.num_bulk_in		= NUM_DONT_CARE,
@@ -641,9 +641,9 @@ static struct usb_serial_driver keyspan_2port_device = {
 static struct usb_serial_driver keyspan_4port_device = {
 	.driver = {
 		.owner		= THIS_MODULE,
+		.name		= "keyspan_4",
 	},
-	.name			= "Keyspan 4 port adapter",
-	.short_name		= "keyspan_4",
+	.description		= "Keyspan 4 port adapter",
 	.id_table		= keyspan_4port_ids,
 	.num_interrupt_in	= NUM_DONT_CARE,
 	.num_bulk_in		= 5,

trunk/drivers/usb/serial/keyspan_pda.c

@@ -786,9 +786,9 @@ static void keyspan_pda_shutdown (struct usb_serial *serial)
 static struct usb_serial_driver keyspan_pda_fake_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"keyspan_pda_pre",
 	},
-	.name =			"Keyspan PDA - (prerenumeration)",
-	.short_name =		"keyspan_pda_pre",
+	.description =		"Keyspan PDA - (prerenumeration)",
 	.id_table =		id_table_fake,
 	.num_interrupt_in =	NUM_DONT_CARE,
 	.num_bulk_in =		NUM_DONT_CARE,
@@ -802,9 +802,9 @@ static struct usb_serial_driver keyspan_pda_fake_device = {
 static struct usb_serial_driver xircom_pgs_fake_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"xircom_no_firm",
 	},
-	.name =			"Xircom / Entregra PGS - (prerenumeration)",
-	.short_name =		"xircom_no_firm",
+	.description =		"Xircom / Entregra PGS - (prerenumeration)",
 	.id_table =		id_table_fake_xircom,
 	.num_interrupt_in =	NUM_DONT_CARE,
 	.num_bulk_in =		NUM_DONT_CARE,
@@ -817,9 +817,9 @@ static struct usb_serial_driver xircom_pgs_fake_device = {
 static struct usb_serial_driver keyspan_pda_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"keyspan_pda",
 	},
-	.name =			"Keyspan PDA",
-	.short_name =		"keyspan_pda",
+	.description =		"Keyspan PDA",
 	.id_table =		id_table_std,
 	.num_interrupt_in =	1,
 	.num_bulk_in =		0,

trunk/drivers/usb/serial/kl5kusb105.c

@@ -126,9 +126,9 @@ static struct usb_driver kl5kusb105d_driver = {
 static struct usb_serial_driver kl5kusb105d_device = {
 	.driver = {
 		.owner =	THIS_MODULE,
+		.name =		"kl5kusb105d",
 	},
-	.name =		     "KL5KUSB105D / PalmConnect",
-	.short_name =	     "kl5kusb105d",
+	.description =	     "KL5KUSB105D / PalmConnect",
 	.id_table =	     id_table,
 	.num_interrupt_in =  1,
 	.num_bulk_in =	     1,