git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
mct_u232.c
diff --git
a/drivers/usb/serial/mct_u232.c
b/drivers/usb/serial/mct_u232.c
index
b6d6cab
..
38b1d17
100644
(file)
--- a/
drivers/usb/serial/mct_u232.c
+++ b/
drivers/usb/serial/mct_u232.c
@@
-64,7
+64,6
@@
* (via linux-usb-devel).
*/
* (via linux-usb-devel).
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
@@
-76,7
+75,7
@@
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
-#include
"usb-serial.h"
+#include
<linux/usb/serial.h>
#include "mct_u232.h"
/*
#include "mct_u232.h"
/*
@@
-97,9
+96,9
@@
static int mct_u232_open (struct usb_serial_port *port,
struct file *filp);
static void mct_u232_close (struct usb_serial_port *port,
struct file *filp);
struct file *filp);
static void mct_u232_close (struct usb_serial_port *port,
struct file *filp);
-static void mct_u232_read_int_callback (struct urb *urb
, struct pt_regs *regs
);
+static void mct_u232_read_int_callback (struct urb *urb);
static void mct_u232_set_termios (struct usb_serial_port *port,
static void mct_u232_set_termios (struct usb_serial_port *port,
- struct termios * old);
+ struct
k
termios * old);
static int mct_u232_ioctl (struct usb_serial_port *port,
struct file * file,
unsigned int cmd,
static int mct_u232_ioctl (struct usb_serial_port *port,
struct file * file,
unsigned int cmd,
@@
-348,10
+347,9
@@
static int mct_u232_startup (struct usb_serial *serial)
struct mct_u232_private *priv;
struct usb_serial_port *port, *rport;
struct mct_u232_private *priv;
struct usb_serial_port *port, *rport;
- priv = k
m
alloc(sizeof(struct mct_u232_private), GFP_KERNEL);
+ priv = k
z
alloc(sizeof(struct mct_u232_private), GFP_KERNEL);
if (!priv)
return -ENOMEM;
if (!priv)
return -ENOMEM;
- memset(priv, 0, sizeof(struct mct_u232_private));
spin_lock_init(&priv->lock);
usb_set_serial_port_data(serial->port[0], priv);
spin_lock_init(&priv->lock);
usb_set_serial_port_data(serial->port[0], priv);
@@
-360,10
+358,8
@@
static int mct_u232_startup (struct usb_serial *serial)
/* Puh, that's dirty */
port = serial->port[0];
rport = serial->port[1];
/* Puh, that's dirty */
port = serial->port[0];
rport = serial->port[1];
- if (port->read_urb) {
- /* No unlinking, it wasn't submitted yet. */
- usb_free_urb(port->read_urb);
- }
+ /* No unlinking, it wasn't submitted yet. */
+ usb_free_urb(port->read_urb);
port->read_urb = rport->interrupt_in_urb;
rport->interrupt_in_urb = NULL;
port->read_urb->context = port;
port->read_urb = rport->interrupt_in_urb;
rport->interrupt_in_urb = NULL;
port->read_urb->context = port;
@@
-468,7
+464,7
@@
static void mct_u232_close (struct usb_serial_port *port, struct file *filp)
} /* mct_u232_close */
} /* mct_u232_close */
-static void mct_u232_read_int_callback (struct urb *urb
, struct pt_regs *regs
)
+static void mct_u232_read_int_callback (struct urb *urb)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
struct mct_u232_private *priv = usb_get_serial_port_data(port);
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
struct mct_u232_private *priv = usb_get_serial_port_data(port);
@@
-560,7
+556,7
@@
exit:
} /* mct_u232_read_int_callback */
static void mct_u232_set_termios (struct usb_serial_port *port,
} /* mct_u232_read_int_callback */
static void mct_u232_set_termios (struct usb_serial_port *port,
- struct termios *old_termios)
+ struct
k
termios *old_termios)
{
struct usb_serial *serial = port->serial;
struct mct_u232_private *priv = usb_get_serial_port_data(port);
{
struct usb_serial *serial = port->serial;
struct mct_u232_private *priv = usb_get_serial_port_data(port);