diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2005-04-29 11:09:44 -0400 |
---|---|---|
committer | Greg KH <gregkh@suse.de> | 2005-05-04 02:31:50 -0400 |
commit | 5e54f91d8d770c5a48da10a5c9c314c1c926536b (patch) | |
tree | 3e453d56dda488e18b198b544345829aa7015fb2 /drivers/usb | |
parent | 6f92872cc8085b9e65a8ec07aed106ce5d24f60b (diff) |
[PATCH] USB: ftdi_sio redundant macro removal
[ftdi_sio] Replaced redundant INTERFACE_A and INTERFACE_B macros with
the equivalent PIT_SIOA and PIT_SIOB macros.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index b31e09b099ef..0c4b43533268 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1483,10 +1483,10 @@ static int ftdi_FT2232C_startup (struct usb_serial *serial) | |||
1483 | inter = serial->interface->altsetting->desc.bInterfaceNumber; | 1483 | inter = serial->interface->altsetting->desc.bInterfaceNumber; |
1484 | 1484 | ||
1485 | if (inter) { | 1485 | if (inter) { |
1486 | priv->interface = INTERFACE_B; | 1486 | priv->interface = PIT_SIOB; |
1487 | } | 1487 | } |
1488 | else { | 1488 | else { |
1489 | priv->interface = INTERFACE_A; | 1489 | priv->interface = PIT_SIOA; |
1490 | } | 1490 | } |
1491 | priv->baud_base = 48000000 / 2; /* Would be / 16, but FT2232C supports multiple of 0.125 divisor fractions! */ | 1491 | priv->baud_base = 48000000 / 2; /* Would be / 16, but FT2232C supports multiple of 0.125 divisor fractions! */ |
1492 | 1492 | ||
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 3734b5e339a0..96be36441149 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
@@ -279,10 +279,6 @@ | |||
279 | #define FTDI_SIO_SET_LATENCY_TIMER 9 /* Set the latency timer */ | 279 | #define FTDI_SIO_SET_LATENCY_TIMER 9 /* Set the latency timer */ |
280 | #define FTDI_SIO_GET_LATENCY_TIMER 10 /* Get the latency timer */ | 280 | #define FTDI_SIO_GET_LATENCY_TIMER 10 /* Get the latency timer */ |
281 | 281 | ||
282 | /* Port interface code for FT2232C */ | ||
283 | #define INTERFACE_A 1 | ||
284 | #define INTERFACE_B 2 | ||
285 | |||
286 | 282 | ||
287 | /* | 283 | /* |
288 | * BmRequestType: 1100 0000b | 284 | * BmRequestType: 1100 0000b |