Skip to content

L
linux-davinci
Commit c3e06f2f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: aten2011: remove wrappers around serial get and put data functions 

Don't wrap things that do not need to be wrapped...

Cc: Russell Lang <gsview@ghostgum.com.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4649dd3a
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 54 deletions
drivers/staging/uc2322/aten2011.c
View file @ c3e06f2f
...@@ -229,32 +229,6 @@ static int debug = 0; ...@@ -229,32 +229,6 @@ static int debug = 0;
/* FIXME make this somehow dynamic and not build time specific */ /* FIXME make this somehow dynamic and not build time specific */
static int RS485mode = 0; static int RS485mode = 0;
static inline void ATEN2011_set_serial_private(struct usb_serial *serial,
struct ATENINTL_serial *data)
{
usb_set_serial_data(serial, (void *)data);
}
static inline struct ATENINTL_serial *ATEN2011_get_serial_private(struct
usb_serial
*serial)
{
return (struct ATENINTL_serial *)usb_get_serial_data(serial);
}
static inline void ATEN2011_set_port_private(struct usb_serial_port *port,
struct ATENINTL_port *data)
{
usb_set_serial_port_data(port, (void *)data);
}
static inline struct ATENINTL_port *ATEN2011_get_port_private(struct
usb_serial_port
*port)
{
return (struct ATENINTL_port *)usb_get_serial_port_data(port);
}
static int set_reg_sync(struct usb_serial_port *port, __u16 reg, __u16 val) static int set_reg_sync(struct usb_serial_port *port, __u16 reg, __u16 val)
{ {
struct usb_device *dev = port->serial->dev; struct usb_device *dev = port->serial->dev;
...@@ -286,7 +260,7 @@ static int set_uart_reg(struct usb_serial_port *port, __u16 reg, __u16 val) ...@@ -286,7 +260,7 @@ static int set_uart_reg(struct usb_serial_port *port, __u16 reg, __u16 val)
struct ATENINTL_serial *a_serial; struct ATENINTL_serial *a_serial;
__u16 minor; __u16 minor;
a_serial = ATEN2011_get_serial_private(port->serial); a_serial = usb_get_serial_data(port->serial);
minor = port->serial->minor; minor = port->serial->minor;
if (minor == SERIAL_TTY_NO_MINOR) if (minor == SERIAL_TTY_NO_MINOR)
minor = 0; minor = 0;
...@@ -319,7 +293,7 @@ static int get_uart_reg(struct usb_serial_port *port, __u16 reg, __u16 *val) ...@@ -319,7 +293,7 @@ static int get_uart_reg(struct usb_serial_port *port, __u16 reg, __u16 *val)
struct ATENINTL_serial *a_serial; struct ATENINTL_serial *a_serial;
__u16 minor = port->serial->minor; __u16 minor = port->serial->minor;
a_serial = ATEN2011_get_serial_private(port->serial); a_serial = usb_get_serial_data(port->serial);
if (minor == SERIAL_TTY_NO_MINOR) if (minor == SERIAL_TTY_NO_MINOR)
minor = 0; minor = 0;
...@@ -546,7 +520,7 @@ static void ATEN2011_interrupt_callback(struct urb *urb) ...@@ -546,7 +520,7 @@ static void ATEN2011_interrupt_callback(struct urb *urb)
} }
// printk("%s data is sp1:%x sp2:%x sp3:%x sp4:%x status:%x\n",__FUNCTION__,sp1,sp2,sp3,sp4,st); // printk("%s data is sp1:%x sp2:%x sp3:%x sp4:%x status:%x\n",__FUNCTION__,sp1,sp2,sp3,sp4,st);
for (i = 0; i < serial->num_ports; i++) { for (i = 0; i < serial->num_ports; i++) {
ATEN2011_port = ATEN2011_get_port_private(serial->port[i]); ATEN2011_port = usb_get_serial_port_data(serial->port[i]);
minor = serial->minor; minor = serial->minor;
if (minor == SERIAL_TTY_NO_MINOR) if (minor == SERIAL_TTY_NO_MINOR)
minor = 0; minor = 0;
...@@ -639,7 +613,7 @@ static void ATEN2011_bulk_in_callback(struct urb *urb) ...@@ -639,7 +613,7 @@ static void ATEN2011_bulk_in_callback(struct urb *urb)
DPRINTK("%s\n", "Entering... \n"); DPRINTK("%s\n", "Entering... \n");
data = urb->transfer_buffer; data = urb->transfer_buffer;
ATEN2011_serial = ATEN2011_get_serial_private(serial); ATEN2011_serial = usb_get_serial_data(serial);
DPRINTK("%s", "Entering ........... \n"); DPRINTK("%s", "Entering ........... \n");
...@@ -742,7 +716,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -742,7 +716,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port,
//ATEN2011_serial->NoOfOpenPorts++; //ATEN2011_serial->NoOfOpenPorts++;
serial = port->serial; serial = port->serial;
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) if (ATEN2011_port == NULL)
return -ENODEV; return -ENODEV;
...@@ -764,7 +738,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -764,7 +738,7 @@ static int ATEN2011_open(struct tty_struct *tty, struct usb_serial_port *port,
*/ */
// port0 = serial->port[0]; // port0 = serial->port[0];
ATEN2011_serial = ATEN2011_get_serial_private(serial); ATEN2011_serial = usb_get_serial_data(serial);
if (ATEN2011_serial == NULL) //|| port0 == NULL) if (ATEN2011_serial == NULL) //|| port0 == NULL)
{ {
...@@ -1097,7 +1071,7 @@ static int ATEN2011_chars_in_buffer(struct tty_struct *tty) ...@@ -1097,7 +1071,7 @@ static int ATEN2011_chars_in_buffer(struct tty_struct *tty)
//DPRINTK("%s \n"," ATEN2011_chars_in_buffer:entering ..........."); //DPRINTK("%s \n"," ATEN2011_chars_in_buffer:entering ...........");
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) { if (ATEN2011_port == NULL) {
DPRINTK("%s \n", "ATEN2011_break:leaving ..........."); DPRINTK("%s \n", "ATEN2011_break:leaving ...........");
return -1; return -1;
...@@ -1163,8 +1137,8 @@ static void ATEN2011_close(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1163,8 +1137,8 @@ static void ATEN2011_close(struct tty_struct *tty, struct usb_serial_port *port,
serial = port->serial; serial = port->serial;
// take the Adpater and port's private data // take the Adpater and port's private data
ATEN2011_serial = ATEN2011_get_serial_private(serial); ATEN2011_serial = usb_get_serial_data(serial);
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL)) { if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL)) {
return; return;
} }
...@@ -1283,8 +1257,8 @@ static void ATEN2011_break(struct tty_struct *tty, int break_state) ...@@ -1283,8 +1257,8 @@ static void ATEN2011_break(struct tty_struct *tty, int break_state)
serial = port->serial; serial = port->serial;
ATEN2011_serial = ATEN2011_get_serial_private(serial); ATEN2011_serial = usb_get_serial_data(serial);
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL)) { if ((ATEN2011_serial == NULL) || (ATEN2011_port == NULL)) {
return; return;
...@@ -1322,7 +1296,7 @@ static int ATEN2011_write_room(struct tty_struct *tty) ...@@ -1322,7 +1296,7 @@ static int ATEN2011_write_room(struct tty_struct *tty)
// DPRINTK("%s \n"," ATEN2011_write_room:entering ..........."); // DPRINTK("%s \n"," ATEN2011_write_room:entering ...........");
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) { if (ATEN2011_port == NULL) {
DPRINTK("%s \n", "ATEN2011_break:leaving ..........."); DPRINTK("%s \n", "ATEN2011_break:leaving ...........");
return -1; return -1;
...@@ -1359,13 +1333,13 @@ static int ATEN2011_write(struct tty_struct *tty, struct usb_serial_port *port, ...@@ -1359,13 +1333,13 @@ static int ATEN2011_write(struct tty_struct *tty, struct usb_serial_port *port,
serial = port->serial; serial = port->serial;
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) { if (ATEN2011_port == NULL) {
DPRINTK("%s", "ATEN2011_port is NULL\n"); DPRINTK("%s", "ATEN2011_port is NULL\n");
return -1; return -1;
} }
ATEN2011_serial = ATEN2011_get_serial_private(serial); ATEN2011_serial = usb_get_serial_data(serial);
if (ATEN2011_serial == NULL) { if (ATEN2011_serial == NULL) {
DPRINTK("%s", "ATEN2011_serial is NULL \n"); DPRINTK("%s", "ATEN2011_serial is NULL \n");
return -1; return -1;
...@@ -1457,7 +1431,7 @@ static void ATEN2011_throttle(struct tty_struct *tty) ...@@ -1457,7 +1431,7 @@ static void ATEN2011_throttle(struct tty_struct *tty)
DPRINTK("- port %d\n", port->number); DPRINTK("- port %d\n", port->number);
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) if (ATEN2011_port == NULL)
return; return;
...@@ -1501,7 +1475,7 @@ static void ATEN2011_unthrottle(struct tty_struct *tty) ...@@ -1501,7 +1475,7 @@ static void ATEN2011_unthrottle(struct tty_struct *tty)
{ {
struct usb_serial_port *port = tty->driver_data; struct usb_serial_port *port = tty->driver_data;
int status; int status;
struct ATENINTL_port *ATEN2011_port = ATEN2011_get_port_private(port); struct ATENINTL_port *ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) if (ATEN2011_port == NULL)
return; return;
...@@ -1550,7 +1524,7 @@ static int ATEN2011_tiocmget(struct tty_struct *tty, struct file *file) ...@@ -1550,7 +1524,7 @@ static int ATEN2011_tiocmget(struct tty_struct *tty, struct file *file)
__u16 mcr; __u16 mcr;
//unsigned int mcr; //unsigned int mcr;
int status = 0; int status = 0;
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
DPRINTK("%s - port %d", __FUNCTION__, port->number); DPRINTK("%s - port %d", __FUNCTION__, port->number);
...@@ -1585,7 +1559,7 @@ static int ATEN2011_tiocmset(struct tty_struct *tty, struct file *file, ...@@ -1585,7 +1559,7 @@ static int ATEN2011_tiocmset(struct tty_struct *tty, struct file *file,
DPRINTK("%s - port %d", __FUNCTION__, port->number); DPRINTK("%s - port %d", __FUNCTION__, port->number);
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) if (ATEN2011_port == NULL)
return -ENODEV; return -ENODEV;
...@@ -1629,7 +1603,7 @@ static void ATEN2011_set_termios(struct tty_struct *tty, ...@@ -1629,7 +1603,7 @@ static void ATEN2011_set_termios(struct tty_struct *tty,
serial = port->serial; serial = port->serial;
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) if (ATEN2011_port == NULL)
return; return;
...@@ -1851,7 +1825,7 @@ static int ATEN2011_ioctl(struct tty_struct *tty, struct file *file, ...@@ -1851,7 +1825,7 @@ static int ATEN2011_ioctl(struct tty_struct *tty, struct file *file,
//printk("%s - port %d, cmd = 0x%x\n", __FUNCTION__, port->number, cmd); //printk("%s - port %d, cmd = 0x%x\n", __FUNCTION__, port->number, cmd);
ATEN2011_port = ATEN2011_get_port_private(port); ATEN2011_port = usb_get_serial_port_data(port);
if (ATEN2011_port == NULL) if (ATEN2011_port == NULL)
return -1; return -1;
...@@ -2329,7 +2303,7 @@ static int ATEN2011_startup(struct usb_serial *serial) ...@@ -2329,7 +2303,7 @@ static int ATEN2011_startup(struct usb_serial *serial)
//initilize status polling flag to 0 //initilize status polling flag to 0
ATEN2011_serial->status_polling_started = 0; ATEN2011_serial->status_polling_started = 0;
ATEN2011_set_serial_private(serial, ATEN2011_serial); usb_set_serial_data(serial, ATEN2011_serial);
ATEN2011_serial->ATEN2011_spectrum_2or4ports = ATEN2011_serial->ATEN2011_spectrum_2or4ports =
ATEN2011_calc_num_ports(serial); ATEN2011_calc_num_ports(serial);
/* we set up the pointers to the endpoints in the ATEN2011_open * /* we set up the pointers to the endpoints in the ATEN2011_open *
...@@ -2341,7 +2315,7 @@ static int ATEN2011_startup(struct usb_serial *serial) ...@@ -2341,7 +2315,7 @@ static int ATEN2011_startup(struct usb_serial *serial)
kmalloc(sizeof(struct ATENINTL_port), GFP_KERNEL); kmalloc(sizeof(struct ATENINTL_port), GFP_KERNEL);
if (ATEN2011_port == NULL) { if (ATEN2011_port == NULL) {
err("%s - Out of memory", __FUNCTION__); err("%s - Out of memory", __FUNCTION__);
ATEN2011_set_serial_private(serial, NULL); usb_set_serial_data(serial, NULL);
kfree(ATEN2011_serial); kfree(ATEN2011_serial);
return -ENOMEM; return -ENOMEM;
} }
...@@ -2354,7 +2328,7 @@ static int ATEN2011_startup(struct usb_serial *serial) ...@@ -2354,7 +2328,7 @@ static int ATEN2011_startup(struct usb_serial *serial)
ATEN2011_port->port = serial->port[i]; ATEN2011_port->port = serial->port[i];
// //
ATEN2011_set_port_private(serial->port[i], ATEN2011_port); usb_set_serial_port_data(serial->port[i], ATEN2011_port);
minor = serial->port[i]->serial->minor; minor = serial->port[i]->serial->minor;
if (minor == SERIAL_TTY_NO_MINOR) if (minor == SERIAL_TTY_NO_MINOR)
...@@ -2392,7 +2366,7 @@ static int ATEN2011_startup(struct usb_serial *serial) ...@@ -2392,7 +2366,7 @@ static int ATEN2011_startup(struct usb_serial *serial)
ATEN2011_port->DcrRegOffset = 0x1c; ATEN2011_port->DcrRegOffset = 0x1c;
} }
ATEN2011_set_port_private(serial->port[i], ATEN2011_port); usb_set_serial_port_data(serial->port[i], ATEN2011_port);
//enable rx_disable bit in control register //enable rx_disable bit in control register
...@@ -2558,17 +2532,17 @@ static void ATEN2011_shutdown(struct usb_serial *serial) ...@@ -2558,17 +2532,17 @@ static void ATEN2011_shutdown(struct usb_serial *serial)
* stop reads and writes on all ports */ * stop reads and writes on all ports */
for (i = 0; i < serial->num_ports; ++i) { for (i = 0; i < serial->num_ports; ++i) {
ATEN2011_port = ATEN2011_get_port_private(serial->port[i]); ATEN2011_port = usb_get_serial_port_data(serial->port[i]);
kfree(ATEN2011_port->ctrl_buf); kfree(ATEN2011_port->ctrl_buf);
usb_kill_urb(ATEN2011_port->control_urb); usb_kill_urb(ATEN2011_port->control_urb);
kfree(ATEN2011_port); kfree(ATEN2011_port);
ATEN2011_set_port_private(serial->port[i], NULL); usb_set_serial_port_data(serial->port[i], NULL);
} }
/* free private structure allocated for serial device */ /* free private structure allocated for serial device */
kfree(ATEN2011_get_serial_private(serial)); kfree(usb_get_serial_data(serial));
ATEN2011_set_serial_private(serial, NULL); usb_set_serial_data(serial, NULL);
DPRINTK("%s\n", "Thank u :: "); DPRINTK("%s\n", "Thank u :: ");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment