mirror of
https://github.com/torvalds/linux.git
synced 2026-09-28 20:12:01 +02:00
USB: serial: digi_acceleport: clean up declarations and whitespace
Clean up the driver by moving some declarations to approximate reverse xmas style and removing some stray newlines (and adding a few for readability). While at it, also replace two spaces before tabs in the driver structs. Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold
parent
1c44f3b971
commit
dc2723aab4
|
|
@ -271,7 +271,7 @@ static struct usb_serial_driver digi_acceleport_2_device = {
|
|||
.dtr_rts = digi_dtr_rts,
|
||||
.write = digi_write,
|
||||
.write_room = digi_write_room,
|
||||
.write_bulk_callback = digi_write_bulk_callback,
|
||||
.write_bulk_callback = digi_write_bulk_callback,
|
||||
.read_bulk_callback = digi_read_bulk_callback,
|
||||
.chars_in_buffer = digi_chars_in_buffer,
|
||||
.throttle = digi_rx_throttle,
|
||||
|
|
@ -300,7 +300,7 @@ static struct usb_serial_driver digi_acceleport_4_device = {
|
|||
.close = digi_close,
|
||||
.write = digi_write,
|
||||
.write_room = digi_write_room,
|
||||
.write_bulk_callback = digi_write_bulk_callback,
|
||||
.write_bulk_callback = digi_write_bulk_callback,
|
||||
.read_bulk_callback = digi_read_bulk_callback,
|
||||
.chars_in_buffer = digi_chars_in_buffer,
|
||||
.throttle = digi_rx_throttle,
|
||||
|
|
@ -334,7 +334,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
|
|||
* interruptible_sleep_on_timeout is deprecated and has been replaced
|
||||
* with the equivalent code.
|
||||
*/
|
||||
|
||||
static long cond_wait_interruptible_timeout_irqrestore(
|
||||
wait_queue_head_t *q, long timeout,
|
||||
spinlock_t *lock, unsigned long flags)
|
||||
|
|
@ -367,15 +366,14 @@ static struct usb_serial_port *digi_get_oob_port(struct usb_serial *serial)
|
|||
* the interruptible flag is true, or a negative error
|
||||
* returned by usb_submit_urb.
|
||||
*/
|
||||
|
||||
static int digi_write_oob_command(struct usb_serial_port *port,
|
||||
unsigned char *buf, int count, int interruptible)
|
||||
{
|
||||
int ret = 0;
|
||||
int len;
|
||||
struct usb_serial_port *oob_port = digi_get_oob_port(port->serial);
|
||||
struct digi_port *oob_priv = usb_get_serial_port_data(oob_port);
|
||||
unsigned long flags;
|
||||
int ret = 0;
|
||||
int len;
|
||||
|
||||
dev_dbg(&port->dev,
|
||||
"digi_write_oob_command: TOP: port=%d, count=%d\n",
|
||||
|
|
@ -412,10 +410,8 @@ static int digi_write_oob_command(struct usb_serial_port *port,
|
|||
dev_err(&port->dev, "%s: usb_submit_urb failed, ret=%d\n",
|
||||
__func__, ret);
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Digi Write In Band Command
|
||||
*
|
||||
|
|
@ -427,16 +423,15 @@ static int digi_write_oob_command(struct usb_serial_port *port,
|
|||
* timeout ticks. Returns 0 if successful, or a negative
|
||||
* error returned by digi_write.
|
||||
*/
|
||||
|
||||
static int digi_write_inb_command(struct usb_serial_port *port,
|
||||
unsigned char *buf, int count, unsigned long timeout)
|
||||
{
|
||||
int ret = 0;
|
||||
int len;
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned char *data = port->write_urb->transfer_buffer;
|
||||
unsigned long expire;
|
||||
unsigned long flags;
|
||||
int ret = 0;
|
||||
int len;
|
||||
|
||||
dev_dbg(&port->dev, "digi_write_inb_command: TOP: port=%d, count=%d\n",
|
||||
priv->dp_port_num, count);
|
||||
|
|
@ -490,7 +485,6 @@ static int digi_write_inb_command(struct usb_serial_port *port,
|
|||
count -= len;
|
||||
buf += len;
|
||||
}
|
||||
|
||||
}
|
||||
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
|
||||
|
||||
|
|
@ -501,7 +495,6 @@ static int digi_write_inb_command(struct usb_serial_port *port,
|
|||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Digi Set Modem Signals
|
||||
*
|
||||
|
|
@ -511,17 +504,15 @@ static int digi_write_inb_command(struct usb_serial_port *port,
|
|||
* -EINTR if interrupted while sleeping, or a non-zero error
|
||||
* returned by usb_submit_urb.
|
||||
*/
|
||||
|
||||
static int digi_set_modem_signals(struct usb_serial_port *port,
|
||||
unsigned int modem_signals, int interruptible)
|
||||
{
|
||||
|
||||
int ret;
|
||||
struct digi_port *port_priv = usb_get_serial_port_data(port);
|
||||
struct usb_serial_port *oob_port = digi_get_oob_port(port->serial);
|
||||
struct digi_port *oob_priv = usb_get_serial_port_data(oob_port);
|
||||
unsigned char *data = oob_port->write_urb->transfer_buffer;
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
|
||||
dev_dbg(&port->dev,
|
||||
"digi_set_modem_signals: TOP: port=%d, modem_signals=0x%x\n",
|
||||
|
|
@ -579,14 +570,13 @@ static int digi_set_modem_signals(struct usb_serial_port *port,
|
|||
* is only called from close, and only one process can be in close on a
|
||||
* port at a time, so its ok.
|
||||
*/
|
||||
|
||||
static int digi_transmit_idle(struct usb_serial_port *port,
|
||||
unsigned long timeout)
|
||||
{
|
||||
int ret;
|
||||
unsigned char buf[2];
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned char buf[2];
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
|
||||
spin_lock_irqsave(&priv->dp_port_lock, flags);
|
||||
priv->dp_transmit_idle = 0;
|
||||
|
|
@ -613,16 +603,15 @@ static int digi_transmit_idle(struct usb_serial_port *port,
|
|||
}
|
||||
priv->dp_transmit_idle = 0;
|
||||
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
|
||||
static void digi_rx_throttle(struct tty_struct *tty)
|
||||
{
|
||||
unsigned long flags;
|
||||
struct usb_serial_port *port = tty->driver_data;
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned long flags;
|
||||
|
||||
/* stop receiving characters by not resubmitting the read urb */
|
||||
spin_lock_irqsave(&priv->dp_port_lock, flags);
|
||||
|
|
@ -631,13 +620,12 @@ static void digi_rx_throttle(struct tty_struct *tty)
|
|||
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
static void digi_rx_unthrottle(struct tty_struct *tty)
|
||||
{
|
||||
int ret = 0;
|
||||
unsigned long flags;
|
||||
struct usb_serial_port *port = tty->driver_data;
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned long flags;
|
||||
int ret = 0;
|
||||
|
||||
spin_lock_irqsave(&priv->dp_port_lock, flags);
|
||||
|
||||
|
|
@ -657,7 +645,6 @@ static void digi_rx_unthrottle(struct tty_struct *tty)
|
|||
__func__, ret, priv->dp_port_num);
|
||||
}
|
||||
|
||||
|
||||
static void digi_set_termios(struct tty_struct *tty,
|
||||
struct usb_serial_port *port,
|
||||
const struct ktermios *old_termios)
|
||||
|
|
@ -768,7 +755,6 @@ static void digi_set_termios(struct tty_struct *tty,
|
|||
|
||||
/* set stop bits */
|
||||
if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) {
|
||||
|
||||
if ((cflag & CSTOPB))
|
||||
arg = DIGI_STOP_BITS_2;
|
||||
else
|
||||
|
|
@ -778,7 +764,6 @@ static void digi_set_termios(struct tty_struct *tty,
|
|||
buf[i++] = priv->dp_port_num;
|
||||
buf[i++] = arg;
|
||||
buf[i++] = 0;
|
||||
|
||||
}
|
||||
|
||||
/* set input flow control */
|
||||
|
|
@ -847,7 +832,6 @@ static void digi_set_termios(struct tty_struct *tty,
|
|||
tty_encode_baud_rate(tty, baud, baud);
|
||||
}
|
||||
|
||||
|
||||
static int digi_break_ctl(struct tty_struct *tty, int break_state)
|
||||
{
|
||||
struct usb_serial_port *port = tty->driver_data;
|
||||
|
|
@ -861,43 +845,41 @@ static int digi_break_ctl(struct tty_struct *tty, int break_state)
|
|||
return digi_write_inb_command(port, buf, 4, 0);
|
||||
}
|
||||
|
||||
|
||||
static int digi_tiocmget(struct tty_struct *tty)
|
||||
{
|
||||
struct usb_serial_port *port = tty->driver_data;
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned int val;
|
||||
unsigned long flags;
|
||||
unsigned int val;
|
||||
|
||||
spin_lock_irqsave(&priv->dp_port_lock, flags);
|
||||
val = priv->dp_modem_signals;
|
||||
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
|
||||
static int digi_tiocmset(struct tty_struct *tty,
|
||||
unsigned int set, unsigned int clear)
|
||||
{
|
||||
struct usb_serial_port *port = tty->driver_data;
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned int val;
|
||||
unsigned long flags;
|
||||
unsigned int val;
|
||||
|
||||
spin_lock_irqsave(&priv->dp_port_lock, flags);
|
||||
val = (priv->dp_modem_signals & ~clear) | set;
|
||||
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
|
||||
|
||||
return digi_set_modem_signals(port, val, 1);
|
||||
}
|
||||
|
||||
|
||||
static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,
|
||||
const unsigned char *buf, int count)
|
||||
{
|
||||
|
||||
int ret, data_len, new_len;
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned char *data = port->write_urb->transfer_buffer;
|
||||
int ret, data_len, new_len;
|
||||
unsigned long flags;
|
||||
|
||||
dev_dbg(&port->dev, "digi_write: TOP: port=%d, count=%d\n",
|
||||
|
|
@ -960,21 +942,20 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,
|
|||
"%s: usb_submit_urb failed, ret=%d, port=%d\n",
|
||||
__func__, ret, priv->dp_port_num);
|
||||
dev_dbg(&port->dev, "digi_write: returning %d\n", ret);
|
||||
return ret;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void digi_write_bulk_callback(struct urb *urb)
|
||||
{
|
||||
|
||||
struct usb_serial_port *port = urb->context;
|
||||
struct usb_serial *serial;
|
||||
struct digi_port *priv;
|
||||
struct digi_serial *serial_priv;
|
||||
unsigned long flags;
|
||||
int ret = 0;
|
||||
int status = urb->status;
|
||||
unsigned long flags;
|
||||
bool wakeup;
|
||||
int ret = 0;
|
||||
|
||||
/* port and serial sanity check */
|
||||
if (port == NULL || (priv = usb_get_serial_port_data(port)) == NULL) {
|
||||
|
|
@ -1047,8 +1028,8 @@ static unsigned int digi_write_room(struct tty_struct *tty)
|
|||
|
||||
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
|
||||
dev_dbg(&port->dev, "digi_write_room: port=%d, room=%u\n", priv->dp_port_num, room);
|
||||
return room;
|
||||
|
||||
return room;
|
||||
}
|
||||
|
||||
static unsigned int digi_chars_in_buffer(struct tty_struct *tty)
|
||||
|
|
@ -1078,10 +1059,10 @@ static void digi_dtr_rts(struct usb_serial_port *port, int on)
|
|||
|
||||
static int digi_open(struct tty_struct *tty, struct usb_serial_port *port)
|
||||
{
|
||||
int ret;
|
||||
unsigned char buf[32];
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
struct ktermios not_termios;
|
||||
unsigned char buf[32];
|
||||
int ret;
|
||||
|
||||
/* be sure the device is started up */
|
||||
if (digi_startup_device(port->serial) != 0)
|
||||
|
|
@ -1124,13 +1105,12 @@ static int digi_open(struct tty_struct *tty, struct usb_serial_port *port)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void digi_close(struct usb_serial_port *port)
|
||||
{
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
unsigned char buf[32];
|
||||
DEFINE_WAIT(wait);
|
||||
int ret;
|
||||
unsigned char buf[32];
|
||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||
|
||||
usb_kill_urb(port->read_urb);
|
||||
|
||||
|
|
@ -1187,14 +1167,12 @@ static void digi_close(struct usb_serial_port *port)
|
|||
usb_kill_urb(port->write_urb);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Digi Startup Device
|
||||
*
|
||||
* Starts read on the OOB port. Must be called AFTER startup, with
|
||||
* urbs initialized. Returns 0 if successful, non-zero error otherwise.
|
||||
*/
|
||||
|
||||
static int digi_startup_device(struct usb_serial *serial)
|
||||
{
|
||||
struct digi_serial *serial_priv = usb_get_serial_data(serial);
|
||||
|
|
@ -1283,7 +1261,6 @@ static int digi_startup(struct usb_serial *serial)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void digi_disconnect(struct usb_serial *serial)
|
||||
{
|
||||
struct digi_serial *serial_priv = usb_get_serial_data(serial);
|
||||
|
|
@ -1293,7 +1270,6 @@ static void digi_disconnect(struct usb_serial *serial)
|
|||
usb_kill_urb(oob_port->write_urb);
|
||||
}
|
||||
|
||||
|
||||
static void digi_release(struct usb_serial *serial)
|
||||
{
|
||||
struct digi_serial *serial_priv;
|
||||
|
|
@ -1325,8 +1301,8 @@ static void digi_read_bulk_callback(struct urb *urb)
|
|||
struct usb_serial_port *port = urb->context;
|
||||
struct digi_port *priv;
|
||||
struct digi_serial *serial_priv;
|
||||
int ret;
|
||||
int status = urb->status;
|
||||
int ret;
|
||||
|
||||
/* port sanity check, do not resubmit if port is not valid */
|
||||
if (port == NULL)
|
||||
|
|
@ -1378,7 +1354,6 @@ static void digi_read_bulk_callback(struct urb *urb)
|
|||
"%s: failed resubmitting urb, ret=%d, port=%d\n",
|
||||
__func__, ret, priv->dp_port_num);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1390,7 +1365,6 @@ static void digi_read_bulk_callback(struct urb *urb)
|
|||
* It returns 0 if successful, 1 if successful but the port is
|
||||
* throttled, and -1 if the sanity checks failed.
|
||||
*/
|
||||
|
||||
static int digi_read_inb_callback(struct urb *urb)
|
||||
{
|
||||
struct usb_serial_port *port = urb->context;
|
||||
|
|
@ -1468,10 +1442,8 @@ static int digi_read_inb_callback(struct urb *urb)
|
|||
dev_dbg(&port->dev, "%s: unknown opcode: %d\n", __func__, opcode);
|
||||
|
||||
return throttled ? 1 : 0;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Digi Read OOB Callback
|
||||
*
|
||||
|
|
@ -1480,10 +1452,8 @@ static int digi_read_inb_callback(struct urb *urb)
|
|||
* the port->serial is valid. It returns 0 if successful, and
|
||||
* -1 if the sanity checks failed.
|
||||
*/
|
||||
|
||||
static int digi_read_oob_callback(struct urb *urb)
|
||||
{
|
||||
|
||||
struct usb_serial_port *port = urb->context;
|
||||
struct usb_serial *serial = port->serial;
|
||||
struct tty_struct *tty;
|
||||
|
|
@ -1491,8 +1461,8 @@ static int digi_read_oob_callback(struct urb *urb)
|
|||
unsigned char *buf = urb->transfer_buffer;
|
||||
int opcode, line, status, val;
|
||||
unsigned long flags;
|
||||
int i;
|
||||
unsigned int rts;
|
||||
int i;
|
||||
|
||||
if (urb->actual_length < 4)
|
||||
return -1;
|
||||
|
|
@ -1562,8 +1532,8 @@ static int digi_read_oob_callback(struct urb *urb)
|
|||
}
|
||||
tty_kref_put(tty);
|
||||
}
|
||||
return 0;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
module_usb_serial_driver(serial_drivers, id_table_combined);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user