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

Commit e5f9bf72 authored by Philippe Proulx's avatar Philippe Proulx Committed by Greg Kroah-Hartman
Browse files

serial: omap: fix a few checkpatch warnings 



Signed-off-by: default avatarPhilippe Proulx <philippe.proulx@savoirfairelinux.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 018e7448

drivers/tty/serial/omap-serial.c

+8 −9
Original line number Diff line number Diff line
@@ -316,9 +316,8 @@ static void serial_omap_stop_tx(struct uart_port *port) 
			serial_out(up, UART_OMAP_SCR, up->scr);

			res = (up->rs485.flags & SER_RS485_RTS_AFTER_SEND) ? 1 : 0;

			if (gpio_get_value(up->rts_gpio) != res) {

				if (up->rs485.delay_rts_after_send > 0) {

				if (up->rs485.delay_rts_after_send > 0)

					mdelay(up->rs485.delay_rts_after_send);

				}

				gpio_set_value(up->rts_gpio, res);

			}

		} else {
@@ -422,11 +421,10 @@ static void serial_omap_start_tx(struct uart_port *port) 
		res = (up->rs485.flags & SER_RS485_RTS_ON_SEND) ? 1 : 0;

		if (gpio_get_value(up->rts_gpio) != res) {

			gpio_set_value(up->rts_gpio, res);

			if (up->rs485.delay_rts_before_send > 0) {

			if (up->rs485.delay_rts_before_send > 0)

				mdelay(up->rs485.delay_rts_before_send);

		}

	}

	}



	if ((up->rs485.flags & SER_RS485_ENABLED) &&

	    !(up->rs485.flags & SER_RS485_RX_DURING_TX))
@@ -1724,8 +1722,9 @@ static int serial_omap_probe(struct platform_device *pdev) 
	up->port.uartclk = omap_up_info->uartclk;

	if (!up->port.uartclk) {

		up->port.uartclk = DEFAULT_CLK_SPEED;

		dev_warn(&pdev->dev, "No clock speed specified: using default:"

						"%d\n", DEFAULT_CLK_SPEED);

		dev_warn(&pdev->dev,

			 "No clock speed specified: using default: %d\n"

			 DEFAULT_CLK_SPEED);

	}



	up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;