iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shubhrajyoti Datta 2018-10-16 15:48:02 +05:30 committed by Greg Kroah-Hartman
parent 62104b280a
commit 3b209d253e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/serial/uartlite.c
View File

@ -63,6 +63,7 @@ static struct uart_port *console_port;
struct uartlite_data { struct uartlite_data {
const struct uartlite_reg_ops *reg_ops; const struct uartlite_reg_ops *reg_ops;
struct clk *clk; struct clk *clk;
struct uart_driver *ulite_uart_driver;
}; };
struct uartlite_reg_ops { 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) static int ulite_release(struct device *dev)
{ {
struct uart_port *port = dev_get_drvdata(dev); struct uart_port *port = dev_get_drvdata(dev);
struct uartlite_data *pdata = port->private_data;
int rc = 0; int rc = 0;
if (port) { 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); dev_set_drvdata(dev, NULL);
port->mapbase = 0; port->mapbase = 0;
} }
@ -711,9 +713,10 @@ static int ulite_release(struct device *dev)
static int __maybe_unused ulite_suspend(struct device *dev) static int __maybe_unused ulite_suspend(struct device *dev)
{ {
struct uart_port *port = dev_get_drvdata(dev); struct uart_port *port = dev_get_drvdata(dev);
struct uartlite_data *pdata = port->private_data;
if (port) if (port)
uart_suspend_port(&ulite_uart_driver, port); uart_suspend_port(pdata->ulite_uart_driver, port);
return 0; return 0;
} }
@ -727,9 +730,10 @@ static int __maybe_unused ulite_suspend(struct device *dev)
static int __maybe_unused ulite_resume(struct device *dev) static int __maybe_unused ulite_resume(struct device *dev)
{ {
struct uart_port *port = dev_get_drvdata(dev); struct uart_port *port = dev_get_drvdata(dev);
struct uartlite_data *pdata = port->private_data;
if (port) if (port)
uart_resume_port(&ulite_uart_driver, port); uart_resume_port(pdata->ulite_uart_driver, port);
return 0; return 0;
} }
@ -804,6 +808,7 @@ static int ulite_probe(struct platform_device *pdev)
pdata->clk = NULL; pdata->clk = NULL;
} }
pdata->ulite_uart_driver = &ulite_uart_driver;
ret = clk_prepare_enable(pdata->clk); ret = clk_prepare_enable(pdata->clk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to prepare clock\n"); dev_err(&pdev->dev, "Failed to prepare clock\n");