serial: imx: Remove init() and exit() platform callbacks
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
436e4ab5fc
commit
45af780a0f
@@ -1901,7 +1901,6 @@ static void serial_imx_probe_pdata(struct imx_port *sport,
|
||||
static int serial_imx_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct imx_port *sport;
|
||||
struct imxuart_platform_data *pdata;
|
||||
void __iomem *base;
|
||||
int ret = 0;
|
||||
struct resource *res;
|
||||
@@ -1955,38 +1954,16 @@ static int serial_imx_probe(struct platform_device *pdev)
|
||||
|
||||
imx_ports[sport->port.line] = sport;
|
||||
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
if (pdata && pdata->init) {
|
||||
ret = pdata->init(pdev);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = uart_add_one_port(&imx_reg, &sport->port);
|
||||
if (ret)
|
||||
goto deinit;
|
||||
platform_set_drvdata(pdev, sport);
|
||||
|
||||
return 0;
|
||||
deinit:
|
||||
if (pdata && pdata->exit)
|
||||
pdata->exit(pdev);
|
||||
return ret;
|
||||
return uart_add_one_port(&imx_reg, &sport->port);
|
||||
}
|
||||
|
||||
static int serial_imx_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct imxuart_platform_data *pdata;
|
||||
struct imx_port *sport = platform_get_drvdata(pdev);
|
||||
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
|
||||
uart_remove_one_port(&imx_reg, &sport->port);
|
||||
|
||||
if (pdata && pdata->exit)
|
||||
pdata->exit(pdev);
|
||||
|
||||
return 0;
|
||||
return uart_remove_one_port(&imx_reg, &sport->port);
|
||||
}
|
||||
|
||||
static struct platform_driver serial_imx_driver = {
|
||||
|
Reference in New Issue
Block a user