Rename ARK3116_RCV and ARK3116_SND to ark3116_recv and ark3116_send.
Signed-off-by: Mike McCormack <mikem@xxxxxxxxxx>
---
drivers/usb/serial/ark3116.c | 114 +++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 89ac077..0ab6333 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -45,7 +45,7 @@ static int is_irda(struct usb_serial *serial)
return 0;
}
-static inline int ARK3116_SND(struct usb_serial *serial,
+static inline int ark3116_send(struct usb_serial *serial,
u8 index, u8 value)
{
return usb_control_msg(serial->dev,
@@ -54,7 +54,7 @@ static inline int ARK3116_SND(struct usb_serial *serial,
NULL, 0x00, 1000);
}
-static inline int ARK3116_RCV(struct usb_serial *serial,
+static inline int ark3116_recv(struct usb_serial *serial,
u8 index, u8 *buf)
{
return usb_control_msg(serial->dev,
@@ -77,59 +77,59 @@ static int ark3116_attach(struct usb_serial *serial)
dbg("IrDA mode");
/* 3 */
- ARK3116_SND(serial, 0x02, 0x08);
- ARK3116_SND(serial, 0x01, 0x08);
- ARK3116_SND(serial, 0x08, 0x00);
- ARK3116_SND(serial, 0x0b, is_irda(serial) ? 0x01 : 0x00);
+ ark3116_send(serial, 0x02, 0x08);
+ ark3116_send(serial, 0x01, 0x08);
+ ark3116_send(serial, 0x08, 0x00);
+ ark3116_send(serial, 0x0b, is_irda(serial) ? 0x01 : 0x00);
if (is_irda(serial)) {
- ARK3116_SND(serial, 0x0C, 0x00);
- ARK3116_SND(serial, 0x0D, 0x41);
- ARK3116_SND(serial, 0x0A, 0x01);
+ ark3116_send(serial, 0x0C, 0x00);
+ ark3116_send(serial, 0x0D, 0x41);
+ ark3116_send(serial, 0x0A, 0x01);
}
/* <-- seq7 */
- ARK3116_RCV(serial, 0x03, buf);
- ARK3116_SND(serial, 0x03, 0x80);
- ARK3116_SND(serial, 0x00, 0x1A);
- ARK3116_SND(serial, 0x01, 0x00);
- ARK3116_SND(serial, 0x03, 0x00);
+ ark3116_recv(serial, 0x03, buf);
+ ark3116_send(serial, 0x03, 0x80);
+ ark3116_send(serial, 0x00, 0x1A);
+ ark3116_send(serial, 0x01, 0x00);
+ ark3116_send(serial, 0x03, 0x00);
/* <-- seq12 */
- ARK3116_RCV(serial, 0x04, buf);
- ARK3116_SND(serial, 0x04, 0x00);
+ ark3116_recv(serial, 0x04, buf);
+ ark3116_send(serial, 0x04, 0x00);
/* 14 */
- ARK3116_RCV(serial, 0x04, buf);
- ARK3116_SND(serial, 0x04, 0x00);
+ ark3116_recv(serial, 0x04, buf);
+ ark3116_send(serial, 0x04, 0x00);
/* 16 */
- ARK3116_RCV(serial, 0x04, buf);
+ ark3116_recv(serial, 0x04, buf);
/* --> seq17 */
- ARK3116_SND(serial, 0x04, 0x01);
+ ark3116_send(serial, 0x04, 0x01);
/* <-- seq18 */
- ARK3116_RCV(serial, 0x04, buf);
+ ark3116_recv(serial, 0x04, buf);
/* --> seq19 */
- ARK3116_SND(serial, 0x04, 0x03);
+ ark3116_send(serial, 0x04, 0x03);
/* <-- seq20 */
/* seems like serial port status info (RTS, CTS, ...) */
/* returns modem control line status?! */
- ARK3116_RCV(serial, 0x06, buf);
+ ark3116_recv(serial, 0x06, buf);
/* set 9600 baud & do some init?! */
- ARK3116_SND(serial, 0x03, 0x83);
- ARK3116_SND(serial, 0x00, 0x38);
- ARK3116_SND(serial, 0x01, 0x01);
+ ark3116_send(serial, 0x03, 0x83);
+ ark3116_send(serial, 0x00, 0x38);
+ ark3116_send(serial, 0x01, 0x01);
if (is_irda(serial))
- ARK3116_SND(serial, 0x09, 0x00);
- ARK3116_SND(serial, 0x03, 0x03);
- ARK3116_RCV(serial, 0x04, buf);
- ARK3116_SND(serial, 0x03, 0x00);
- ARK3116_RCV(serial, 0x03, buf);
- ARK3116_SND(serial, 0x03, 0x03);
+ ark3116_send(serial, 0x09, 0x00);
+ ark3116_send(serial, 0x03, 0x03);
+ ark3116_recv(serial, 0x04, buf);
+ ark3116_send(serial, 0x03, 0x00);
+ ark3116_recv(serial, 0x03, buf);
+ ark3116_send(serial, 0x03, 0x03);
kfree(buf);
return 0;
@@ -259,7 +259,7 @@ static void ark3116_set_termios(struct tty_struct *tty,
ark3116_baud = 3000000 / baud;
/* ? */
- ARK3116_RCV(serial, 0x03, buf);
+ ark3116_recv(serial, 0x03, buf);
/* offset = buf[0]; */
/* offset = 0x03; */
@@ -267,24 +267,24 @@ static void ark3116_set_termios(struct tty_struct *tty,
/* set baudrate */
dbg("setting baudrate to %d (->reg=%d)", baud, ark3116_baud);
- ARK3116_SND(serial, 0x03, 0x83);
- ARK3116_SND(serial, 0x00, (ark3116_baud & 0x00FF));
- ARK3116_SND(serial, 0x01, (ark3116_baud & 0xFF00) >> 8);
- ARK3116_SND(serial, 0x03, 0x03);
+ ark3116_send(serial, 0x03, 0x83);
+ ark3116_send(serial, 0x00, (ark3116_baud & 0x00FF));
+ ark3116_send(serial, 0x01, (ark3116_baud & 0xFF00) >> 8);
+ ark3116_send(serial, 0x03, 0x03);
/* ? */
- ARK3116_RCV(serial, 0x04, buf);
- ARK3116_SND(serial, 0x03, 0x00);
+ ark3116_recv(serial, 0x04, buf);
+ ark3116_send(serial, 0x03, 0x00);
/* set data bit count, stop bit count & parity: */
dbg("updating bit count, stop bit or parity (cfg=0x%02X)", config);
- ARK3116_RCV(serial, 0x03, buf);
- ARK3116_SND(serial, 0x03, config);
+ ark3116_recv(serial, 0x03, buf);
+ ark3116_send(serial, 0x03, config);
if (cflag & CRTSCTS)
dbg("CRTSCTS not supported by chipset?!");
- /* TEST ARK3116_SND(154, 0xFE, 0x40, 0xFFFF, 0x0006); */
+ /* TEST ark3116_send(154, 0xFE, 0x40, 0xFFFF, 0x0006); */
kfree(buf);
@@ -311,29 +311,29 @@ static int ark3116_open(struct tty_struct *tty, struct usb_serial_port *port)
goto err_out;
/* open */
- ARK3116_RCV(serial, 0x03, buf);
+ ark3116_recv(serial, 0x03, buf);
- ARK3116_SND(serial, 0x03, 0x82);
- ARK3116_SND(serial, 0x00, 0x1A);
- ARK3116_SND(serial, 0x01, 0x00);
- ARK3116_SND(serial, 0x03, 0x02);
+ ark3116_send(serial, 0x03, 0x82);
+ ark3116_send(serial, 0x00, 0x1A);
+ ark3116_send(serial, 0x01, 0x00);
+ ark3116_send(serial, 0x03, 0x02);
- ARK3116_RCV(serial, 0x04, buf);
- ARK3116_SND(serial, 0x04, 0x02);
+ ark3116_recv(serial, 0x04, buf);
+ ark3116_send(serial, 0x04, 0x02);
- ARK3116_RCV(serial, 0x04, buf);
- ARK3116_SND(serial, 0x04, 0x00);
+ ark3116_recv(serial, 0x04, buf);
+ ark3116_send(serial, 0x04, 0x00);
- ARK3116_RCV(serial, 0x04, buf);
+ ark3116_recv(serial, 0x04, buf);
- ARK3116_SND(serial, 0x04, 0x01);
+ ark3116_send(serial, 0x04, 0x01);
- ARK3116_RCV(serial, 0x04, buf);
+ ark3116_recv(serial, 0x04, buf);
- ARK3116_SND(serial, 0x04, 0x03);
+ ark3116_send(serial, 0x04, 0x03);
/* returns different values (control lines?!) */
- ARK3116_RCV(serial, 0x06, buf);
+ ark3116_recv(serial, 0x06, buf);
/* initialise termios */
if (tty)
@@ -398,7 +398,7 @@ static int ark3116_tiocmget(struct tty_struct *tty, struct file *file)
}
/* read register */
- ARK3116_RCV(serial, 0x06, buf);
+ ark3116_recv(serial, 0x06, buf);
temp = buf[0];
kfree(buf);
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
