From: Johan Hovold <jhovold@gmail.com>
Date: Sun, 29 Dec 2013 18:23:09 +0000 (+0100)
Subject: USB: pl2303: add device-type abstraction
X-Git-Tag: v3.14-rc1~148^2~73
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=359defdaa46c6ecf6a29600f3d57c663c9c35fd2;p=~emulex%2Finfiniband.git

USB: pl2303: add device-type abstraction

Encode all device-type specifics in a struct rather than testing for
device type and spreading such information throughout the driver.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 014dea1e6d0..35aa4973a13 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -132,10 +132,16 @@ MODULE_DEVICE_TABLE(usb, id_table);
 enum pl2303_type {
 	TYPE_01,	/* Type 0 and 1 (difference unknown) */
 	TYPE_HX,	/* HX version of the pl2303 chip */
+	TYPE_COUNT
+};
+
+struct pl2303_type_data {
+	speed_t max_baud_rate;
+	unsigned long quirks;
 };
 
 struct pl2303_serial_private {
-	enum pl2303_type type;
+	struct pl2303_type_data *type;
 	unsigned long quirks;
 };
 
@@ -147,6 +153,13 @@ struct pl2303_private {
 	u8 line_settings[7];
 };
 
+static struct pl2303_type_data pl2303_type_data[TYPE_COUNT] = {
+	[TYPE_01] = {
+		.max_baud_rate =	1228800,
+		.quirks =		PL2303_QUIRK_LEGACY,
+	},
+};
+
 static int pl2303_vendor_read(struct usb_serial *serial, u16 value,
 							unsigned char buf[1])
 {
@@ -223,10 +236,9 @@ static int pl2303_startup(struct usb_serial *serial)
 		type = TYPE_01;		/* type 1 */
 	dev_dbg(&serial->interface->dev, "device type: %d\n", type);
 
-	spriv->type = type;
+	spriv->type = &pl2303_type_data[type];
 	spriv->quirks = (unsigned long)usb_get_serial_data(serial);
-	if (type == TYPE_01)
-		spriv->quirks |= PL2303_QUIRK_LEGACY;
+	spriv->quirks |= spriv->type->quirks;
 
 	usb_set_serial_data(serial, spriv);
 
@@ -336,9 +348,8 @@ static void pl2303_encode_baudrate(struct tty_struct *tty,
 	else
 		baud = baud_sup[i];
 
-	/* type_0, type_1 only support up to 1228800 baud */
-	if (spriv->type == TYPE_01)
-		baud = min_t(speed_t, baud, 1228800);
+	if (spriv->type->max_baud_rate)
+		baud = min_t(speed_t, baud, spriv->type->max_baud_rate);
 
 	if (baud <= 115200) {
 		put_unaligned_le32(baud, buf);