Skip to content

Commit

Permalink
[PATCH] USB: drivers/serial/usb-serial: Remove unneeded void * casts
Browse files Browse the repository at this point in the history 
The following patch removes unneeded casts for the following (void *) pointers:
	- tty_struct->driver_data
	- void *private argument of usb_serial_port_softint()

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Tobias Klauser authored and Greg Kroah-Hartman committed Sep 8, 2005
1 parent 7bb75ae commit 81671dd
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions drivers/usb/serial/usb-serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp)

static void serial_close(struct tty_struct *tty, struct file * filp)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

if (!port)
return;
Expand Down Expand Up @@ -561,7 +561,7 @@ static void serial_close(struct tty_struct *tty, struct file * filp)

static int serial_write (struct tty_struct * tty, const unsigned char *buf, int count)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -EINVAL;

dbg("%s - port %d, %d byte(s)", __FUNCTION__, port->number, count);
Expand All @@ -580,7 +580,7 @@ static int serial_write (struct tty_struct * tty, const unsigned char *buf, int

static int serial_write_room (struct tty_struct *tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -EINVAL;

dbg("%s - port %d", __FUNCTION__, port->number);
Expand All @@ -599,7 +599,7 @@ static int serial_write_room (struct tty_struct *tty)

static int serial_chars_in_buffer (struct tty_struct *tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -EINVAL;

dbg("%s = port %d", __FUNCTION__, port->number);
Expand All @@ -618,7 +618,7 @@ static int serial_chars_in_buffer (struct tty_struct *tty)

static void serial_throttle (struct tty_struct * tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -634,7 +634,7 @@ static void serial_throttle (struct tty_struct * tty)

static void serial_unthrottle (struct tty_struct * tty)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -650,7 +650,7 @@ static void serial_unthrottle (struct tty_struct * tty)

static int serial_ioctl (struct tty_struct *tty, struct file * file, unsigned int cmd, unsigned long arg)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;
int retval = -ENODEV;

dbg("%s - port %d, cmd 0x%.4x", __FUNCTION__, port->number, cmd);
Expand All @@ -672,7 +672,7 @@ static int serial_ioctl (struct tty_struct *tty, struct file * file, unsigned in

static void serial_set_termios (struct tty_struct *tty, struct termios * old)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -688,7 +688,7 @@ static void serial_set_termios (struct tty_struct *tty, struct termios * old)

static void serial_break (struct tty_struct *tty, int break_state)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand Down Expand Up @@ -749,7 +749,7 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int

static int serial_tiocmget (struct tty_struct *tty, struct file *file)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -768,7 +768,7 @@ static int serial_tiocmget (struct tty_struct *tty, struct file *file)
static int serial_tiocmset (struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
{
struct usb_serial_port *port = (struct usb_serial_port *) tty->driver_data;
struct usb_serial_port *port = tty->driver_data;

dbg("%s - port %d", __FUNCTION__, port->number);

Expand All @@ -786,7 +786,7 @@ static int serial_tiocmset (struct tty_struct *tty, struct file *file,

void usb_serial_port_softint(void *private)
{
struct usb_serial_port *port = (struct usb_serial_port *)private;
struct usb_serial_port *port = private;
struct tty_struct *tty;

dbg("%s - port %d", __FUNCTION__, port->number);
Expand Down

0 comments on commit 81671dd

Please sign in to comment.