Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81671ddb authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: drivers/serial/usb-serial: Remove unneeded void * casts 



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: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7bb75aee

drivers/usb/serial/usb-serial.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -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)

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)

	if (!port)

		return;

		return;
@@ -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)

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;

	int retval = -EINVAL;





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

	dbg("%s - port %d, %d byte(s)", __FUNCTION__, port->number, count);
@@ -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) 

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;

	int retval = -EINVAL;





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

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




static int serial_chars_in_buffer (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;

	int retval = -EINVAL;





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

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




static void serial_throttle (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);

	dbg("%s - port %d", __FUNCTION__, port->number);
@@ -634,7 +634,7 @@ static void serial_throttle (struct tty_struct * tty) 




static void serial_unthrottle (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);

	dbg("%s - port %d", __FUNCTION__, port->number);
@@ -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)

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;

	int retval = -ENODEV;





	dbg("%s - port %d, cmd 0x%.4x", __FUNCTION__, port->number, cmd);

	dbg("%s - port %d, cmd 0x%.4x", __FUNCTION__, port->number, cmd);
@@ -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)

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);

	dbg("%s - port %d", __FUNCTION__, port->number);
@@ -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)

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);

	dbg("%s - port %d", __FUNCTION__, port->number);
@@ -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)

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);

	dbg("%s - port %d", __FUNCTION__, port->number);
@@ -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,

static int serial_tiocmset (struct tty_struct *tty, struct file *file,

			    unsigned int set, unsigned int clear)

			    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);

	dbg("%s - port %d", __FUNCTION__, port->number);
@@ -786,7 +786,7 @@ static int serial_tiocmset (struct tty_struct *tty, struct file *file, 




void usb_serial_port_softint(void *private)

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;

	struct tty_struct *tty;





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

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