Commit b70e5e9d authored by Fabian Frederick's avatar Fabian Frederick Committed by Greg Kroah-Hartman
Browse files

serial: amba-pl010: use container_of to resolve uart_amba_port from uart_port 



Use container_of instead of casting first structure member.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72665765

drivers/tty/serial/amba-pl010.c

+24 −12
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ struct uart_amba_port { 


static void pl010_stop_tx(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int cr;



	cr = readb(uap->port.membase + UART010_CR);
@@ -85,7 +86,8 @@ static void pl010_stop_tx(struct uart_port *port) 


static void pl010_start_tx(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int cr;



	cr = readb(uap->port.membase + UART010_CR);
@@ -95,7 +97,8 @@ static void pl010_start_tx(struct uart_port *port) 


static void pl010_stop_rx(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int cr;



	cr = readb(uap->port.membase + UART010_CR);
@@ -105,7 +108,8 @@ static void pl010_stop_rx(struct uart_port *port) 


static void pl010_enable_ms(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int cr;



	cr = readb(uap->port.membase + UART010_CR);
@@ -259,14 +263,16 @@ static irqreturn_t pl010_int(int irq, void *dev_id) 


static unsigned int pl010_tx_empty(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int status = readb(uap->port.membase + UART01x_FR);

	return status & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;

}



static unsigned int pl010_get_mctrl(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int result = 0;

	unsigned int status;
@@ -283,7 +289,8 @@ static unsigned int pl010_get_mctrl(struct uart_port *port) 


static void pl010_set_mctrl(struct uart_port *port, unsigned int mctrl)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);



	if (uap->data)

		uap->data->set_mctrl(uap->dev, uap->port.membase, mctrl);
@@ -291,7 +298,8 @@ static void pl010_set_mctrl(struct uart_port *port, unsigned int mctrl) 


static void pl010_break_ctl(struct uart_port *port, int break_state)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned long flags;

	unsigned int lcr_h;
@@ -307,7 +315,8 @@ static void pl010_break_ctl(struct uart_port *port, int break_state) 


static int pl010_startup(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	int retval;



	/*
@@ -347,7 +356,8 @@ static int pl010_startup(struct uart_port *port) 


static void pl010_shutdown(struct uart_port *port)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);



	/*

	 * Free the interrupt
@@ -374,7 +384,8 @@ static void 
pl010_set_termios(struct uart_port *port, struct ktermios *termios,

		     struct ktermios *old)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int lcr_h, old_cr;

	unsigned long flags;

	unsigned int baud, quot;
@@ -551,7 +562,8 @@ static struct uart_amba_port *amba_ports[UART_NR]; 


static void pl010_console_putchar(struct uart_port *port, int ch)

{

	struct uart_amba_port *uap = (struct uart_amba_port *)port;

	struct uart_amba_port *uap =

		container_of(port, struct uart_amba_port, port);

	unsigned int status;



	do {