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

Commit 98ba0853 authored by Mathieu OTHACEHE's avatar Mathieu OTHACEHE Committed by Johan Hovold
Browse files

USB: serial: ti_usb_3410_5052: remove useless NULL-testing 



It is useless to check the return of usb_get_serial_port_data in the tty
and tty-port callbacks.

No need to check interface private data in close() either.

Signed-off-by: default avatarMathieu OTHACEHE <m.othacehe@gmail.com>
[ johan: amend commit message ]
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 14e3c97c

drivers/usb/serial/ti_usb_3410_5052.c

+1 −33
Original line number Diff line number Diff line
@@ -653,9 +653,6 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port) 
			 TI_PIPE_TIMEOUT_ENABLE |

			 (TI_TRANSFER_TIMEOUT << 2));



	if (tport == NULL)

		return -ENODEV;



	dev = port->serial->dev;

	tdev = tport->tp_tdev;
@@ -784,8 +781,6 @@ static void ti_close(struct usb_serial_port *port) 


	tdev = usb_get_serial_data(port->serial);

	tport = usb_get_serial_port_data(port);

	if (tdev == NULL || tport == NULL)

		return;



	tport->tp_is_open = 0;
@@ -827,7 +822,7 @@ static int ti_write(struct tty_struct *tty, struct usb_serial_port *port, 
		return 0;

	}



	if (tport == NULL || !tport->tp_is_open)

	if (!tport->tp_is_open)

		return -ENODEV;



	count = kfifo_in_locked(&port->write_fifo, data, count,
@@ -845,9 +840,6 @@ static int ti_write_room(struct tty_struct *tty) 
	int room = 0;

	unsigned long flags;



	if (tport == NULL)

		return 0;



	spin_lock_irqsave(&tport->tp_lock, flags);

	room = kfifo_avail(&port->write_fifo);

	spin_unlock_irqrestore(&tport->tp_lock, flags);
@@ -864,9 +856,6 @@ static int ti_chars_in_buffer(struct tty_struct *tty) 
	int chars = 0;

	unsigned long flags;



	if (tport == NULL)

		return 0;



	spin_lock_irqsave(&tport->tp_lock, flags);

	chars = kfifo_len(&port->write_fifo);

	spin_unlock_irqrestore(&tport->tp_lock, flags);
@@ -893,9 +882,6 @@ static void ti_throttle(struct tty_struct *tty) 
	struct usb_serial_port *port = tty->driver_data;

	struct ti_port *tport = usb_get_serial_port_data(port);



	if (tport == NULL)

		return;



	if (I_IXOFF(tty) || C_CRTSCTS(tty))

		ti_stop_read(tport, tty);
@@ -908,9 +894,6 @@ static void ti_unthrottle(struct tty_struct *tty) 
	struct ti_port *tport = usb_get_serial_port_data(port);

	int status;



	if (tport == NULL)

		return;



	if (I_IXOFF(tty) || C_CRTSCTS(tty)) {

		status = ti_restart_read(tport, tty);

		if (status)
@@ -925,9 +908,6 @@ static int ti_ioctl(struct tty_struct *tty, 
	struct usb_serial_port *port = tty->driver_data;

	struct ti_port *tport = usb_get_serial_port_data(port);



	if (tport == NULL)

		return -ENODEV;



	switch (cmd) {

	case TIOCGSERIAL:

		return ti_get_serial_info(tport,
@@ -960,9 +940,6 @@ static void ti_set_termios(struct tty_struct *tty, 
	dev_dbg(&port->dev, "%s - old clfag %08x, old iflag %08x\n", __func__,

		old_termios->c_cflag, old_termios->c_iflag);



	if (tport == NULL)

		return;



	config = kmalloc(sizeof(*config), GFP_KERNEL);

	if (!config)

		return;
@@ -1083,9 +1060,6 @@ static int ti_tiocmget(struct tty_struct *tty) 
	unsigned int mcr;

	unsigned long flags;



	if (tport == NULL)

		return -ENODEV;



	spin_lock_irqsave(&tport->tp_lock, flags);

	msr = tport->tp_msr;

	mcr = tport->tp_shadow_mcr;
@@ -1113,9 +1087,6 @@ static int ti_tiocmset(struct tty_struct *tty, 
	unsigned int mcr;

	unsigned long flags;



	if (tport == NULL)

		return -ENODEV;



	spin_lock_irqsave(&tport->tp_lock, flags);

	mcr = tport->tp_shadow_mcr;
@@ -1146,9 +1117,6 @@ static void ti_break(struct tty_struct *tty, int break_state) 


	dev_dbg(&port->dev, "%s - state = %d\n", __func__, break_state);



	if (tport == NULL)

		return;



	status = ti_write_byte(port, tport->tp_tdev,

		tport->tp_uart_base_addr + TI_UART_OFFSET_LCR,

		TI_LCR_BREAK, break_state == -1 ? TI_LCR_BREAK : 0);