Commit 3b209d25 authored by Shubhrajyoti Datta's avatar Shubhrajyoti Datta Committed by Greg Kroah-Hartman
Browse files

serial-uartlite: Do not use static struct uart_driver out of probe() 



ulite_uart_suspend()/resume() and remove() are using static reference
to struct uart_driver. Assign this referece to private data structure
as preparation step for dynamic struct uart_driver allocation.

Signed-off-by: default avatarShubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62104b28

drivers/tty/serial/uartlite.c

+8 −3
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static struct uart_port *console_port; 
struct uartlite_data {

	const struct uartlite_reg_ops *reg_ops;

	struct clk *clk;

	struct uart_driver *ulite_uart_driver;

};



struct uartlite_reg_ops {
@@ -691,10 +692,11 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq, 
static int ulite_release(struct device *dev)

{

	struct uart_port *port = dev_get_drvdata(dev);

	struct uartlite_data *pdata = port->private_data;

	int rc = 0;



	if (port) {

		rc = uart_remove_one_port(&ulite_uart_driver, port);

		rc = uart_remove_one_port(pdata->ulite_uart_driver, port);

		dev_set_drvdata(dev, NULL);

		port->mapbase = 0;

	}
@@ -711,9 +713,10 @@ static int ulite_release(struct device *dev) 
static int __maybe_unused ulite_suspend(struct device *dev)

{

	struct uart_port *port = dev_get_drvdata(dev);

	struct uartlite_data *pdata = port->private_data;



	if (port)

		uart_suspend_port(&ulite_uart_driver, port);

		uart_suspend_port(pdata->ulite_uart_driver, port);



	return 0;

}
@@ -727,9 +730,10 @@ static int __maybe_unused ulite_suspend(struct device *dev) 
static int __maybe_unused ulite_resume(struct device *dev)

{

	struct uart_port *port = dev_get_drvdata(dev);

	struct uartlite_data *pdata = port->private_data;



	if (port)

		uart_resume_port(&ulite_uart_driver, port);

		uart_resume_port(pdata->ulite_uart_driver, port);



	return 0;

}
@@ -804,6 +808,7 @@ static int ulite_probe(struct platform_device *pdev) 
		pdata->clk = NULL;

	}



	pdata->ulite_uart_driver = &ulite_uart_driver;

	ret = clk_prepare_enable(pdata->clk);

	if (ret) {

		dev_err(&pdev->dev, "Failed to prepare clock\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE