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

Commit 2338a75e authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

serial: 8250_dw: cleanup dw8250_setup_port 



Using the same style of declaring variables as used in the
other functions of the driver. Passing uart_port to the
function instead of uart_8250_port, as it is the one mostly
needed.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 83ce95ef

drivers/tty/serial/8250/8250_dw.c

+33 −33
Original line number Diff line number Diff line
@@ -260,38 +260,6 @@ static bool dw8250_fallback_dma_filter(struct dma_chan *chan, void *param) 
	return false;

}



static void dw8250_setup_port(struct uart_8250_port *up)

{

	struct uart_port	*p = &up->port;

	u32			reg = readl(p->membase + DW_UART_UCV);



	/*

	 * If the Component Version Register returns zero, we know that

	 * ADDITIONAL_FEATURES are not enabled. No need to go any further.

	 */

	if (!reg)

		return;



	dev_dbg_ratelimited(p->dev, "Designware UART version %c.%c%c\n",

		(reg >> 24) & 0xff, (reg >> 16) & 0xff, (reg >> 8) & 0xff);



	reg = readl(p->membase + DW_UART_CPR);

	if (!reg)

		return;



	/* Select the type based on fifo */

	if (reg & DW_UART_CPR_FIFO_MODE) {

		p->type = PORT_16550A;

		p->flags |= UPF_FIXED_TYPE;

		p->fifosize = DW_UART_CPR_FIFO_SIZE(reg);

		up->tx_loadsz = p->fifosize;

		up->capabilities = UART_CAP_FIFO;

	}



	if (reg & DW_UART_CPR_AFCE_MODE)

		up->capabilities |= UART_CAP_AFE;

}



static bool dw8250_idma_filter(struct dma_chan *chan, void *param)

{

	return param == chan->device->dev->parent;
@@ -336,6 +304,38 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) 
	}

}



static void dw8250_setup_port(struct uart_port *p)

{

	struct uart_8250_port *up = up_to_u8250p(p);

	u32 reg;



	/*

	 * If the Component Version Register returns zero, we know that

	 * ADDITIONAL_FEATURES are not enabled. No need to go any further.

	 */

	reg = readl(p->membase + DW_UART_UCV);

	if (!reg)

		return;



	dev_dbg(p->dev, "Designware UART version %c.%c%c\n",

		(reg >> 24) & 0xff, (reg >> 16) & 0xff, (reg >> 8) & 0xff);



	reg = readl(p->membase + DW_UART_CPR);

	if (!reg)

		return;



	/* Select the type based on fifo */

	if (reg & DW_UART_CPR_FIFO_MODE) {

		p->type = PORT_16550A;

		p->flags |= UPF_FIXED_TYPE;

		p->fifosize = DW_UART_CPR_FIFO_SIZE(reg);

		up->capabilities = UART_CAP_FIFO;

	}



	if (reg & DW_UART_CPR_AFCE_MODE)

		up->capabilities |= UART_CAP_AFE;

}



static int dw8250_probe(struct platform_device *pdev)

{

	struct uart_8250_port uart = {};
@@ -473,7 +473,7 @@ static int dw8250_probe(struct platform_device *pdev) 
	}



	if (!data->skip_autocfg)

		dw8250_setup_port(&uart);

		dw8250_setup_port(p);



	/* If we have a valid fifosize, try hooking up DMA */

	if (p->fifosize) {