Skip to content

Commit

Permalink
serial: uartlite: Move uart register to probe
Browse files Browse the repository at this point in the history
Move uart register to probe.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
  • Loading branch information
Shubhrajyoti Datta authored and Michal Simek committed Jun 19, 2018
1 parent a6ddea6 commit a025703
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions drivers/tty/serial/uartlite.c
Expand Up @@ -764,6 +764,15 @@ static int ulite_probe(struct platform_device *pdev)
if (prop)
id = be32_to_cpup(prop);
#endif
if (!ulite_uart_driver.state) {
dev_dbg(&pdev->dev, "uartlite: calling uart_register_driver()\n");
ret = uart_register_driver(&ulite_uart_driver);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to register driver\n");
return ret;
}
}

pdata = devm_kzalloc(&pdev->dev, sizeof(struct uartlite_data),
GFP_KERNEL);
if (!pdata)
Expand Down Expand Up @@ -830,25 +839,8 @@ static struct platform_driver ulite_platform_driver = {

static int __init ulite_init(void)
{
int ret;

pr_debug("uartlite: calling uart_register_driver()\n");
ret = uart_register_driver(&ulite_uart_driver);
if (ret)
goto err_uart;

pr_debug("uartlite: calling platform_driver_register()\n");
ret = platform_driver_register(&ulite_platform_driver);
if (ret)
goto err_plat;

return 0;

err_plat:
uart_unregister_driver(&ulite_uart_driver);
err_uart:
pr_err("registering uartlite driver failed: err=%i", ret);
return ret;
return platform_driver_register(&ulite_platform_driver);
}

static void __exit ulite_exit(void)
Expand Down

0 comments on commit a025703

Please sign in to comment.