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

Commit 574de559 authored by Jingoo Han's avatar Jingoo Han Committed by Greg Kroah-Hartman
Browse files

serial: use dev_get_platdata() 



Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e26439ce

drivers/tty/serial/8250/8250_core.c

+1 −1
Original line number Diff line number Diff line
@@ -3062,7 +3062,7 @@ void serial8250_resume_port(int line) 
 */

static int serial8250_probe(struct platform_device *dev)

{

	struct plat_serial8250_port *p = dev->dev.platform_data;

	struct plat_serial8250_port *p = dev_get_platdata(&dev->dev);

	struct uart_8250_port uart;

	int ret, i, irqflag = 0;

drivers/tty/serial/altera_jtaguart.c

+2 −1
Original line number Diff line number Diff line
@@ -408,7 +408,8 @@ static struct uart_driver altera_jtaguart_driver = { 


static int altera_jtaguart_probe(struct platform_device *pdev)

{

	struct altera_jtaguart_platform_uart *platp = pdev->dev.platform_data;

	struct altera_jtaguart_platform_uart *platp =

			dev_get_platdata(&pdev->dev);

	struct uart_port *port;

	struct resource *res_irq, *res_mem;

	int i = pdev->id;

drivers/tty/serial/altera_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int altera_uart_get_of_uartclk(struct platform_device *pdev, 


static int altera_uart_probe(struct platform_device *pdev)

{

	struct altera_uart_platform_uart *platp = pdev->dev.platform_data;

	struct altera_uart_platform_uart *platp = dev_get_platdata(&pdev->dev);

	struct uart_port *port;

	struct resource *res_mem;

	struct resource *res_irq;

drivers/tty/serial/amba-pl010.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id) 
	uap->port.flags = UPF_BOOT_AUTOCONF;

	uap->port.line = i;

	uap->dev = dev;

	uap->data = dev->dev.platform_data;

	uap->data = dev_get_platdata(&dev->dev);



	amba_ports[i] = uap;

drivers/tty/serial/amba-pl011.c

+7 −7
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void pl011_sgbuf_free(struct dma_chan *chan, struct pl011_sgbuf *sg, 
static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port *uap)

{

	/* DMA is the sole user of the platform data right now */

	struct amba_pl011_data *plat = uap->port.dev->platform_data;

	struct amba_pl011_data *plat = dev_get_platdata(uap->port.dev);

	struct dma_slave_config tx_conf = {

		.dst_addr = uap->port.mapbase + UART01x_DR,

		.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
@@ -1497,10 +1497,10 @@ static int pl011_hwinit(struct uart_port *port) 
	uap->im = readw(uap->port.membase + UART011_IMSC);

	writew(UART011_RTIM | UART011_RXIM, uap->port.membase + UART011_IMSC);



	if (uap->port.dev->platform_data) {

	if (dev_get_platdata(uap->port.dev)) {

		struct amba_pl011_data *plat;



		plat = uap->port.dev->platform_data;

		plat = dev_get_platdata(uap->port.dev);

		if (plat->init)

			plat->init();

	}
@@ -1645,10 +1645,10 @@ static void pl011_shutdown(struct uart_port *port) 
	/* Optionally let pins go into sleep states */

	pinctrl_pm_select_sleep_state(port->dev);



	if (uap->port.dev->platform_data) {

	if (dev_get_platdata(uap->port.dev)) {

		struct amba_pl011_data *plat;



		plat = uap->port.dev->platform_data;

		plat = dev_get_platdata(uap->port.dev);

		if (plat->exit)

			plat->exit();

	}
@@ -2002,10 +2002,10 @@ static int __init pl011_console_setup(struct console *co, char *options) 
	if (ret)

		return ret;



	if (uap->port.dev->platform_data) {

	if (dev_get_platdata(uap->port.dev)) {

		struct amba_pl011_data *plat;



		plat = uap->port.dev->platform_data;

		plat = dev_get_platdata(uap->port.dev);

		if (plat->init)

			plat->init();

	}