Skip to content

Refactor error handling to use goto for cleanup #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alpha-tiger wants to merge 1 commit into
base: boundary-imx_6.1.y
Choose a base branch
from
Open

Refactor error handling to use goto for cleanup #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions drivers/tty/serial/imx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2625,8 +2625,7 @@ static int imx_uart_probe(struct platform_device *pdev)

ret = uart_get_rs485_mode(&sport->port);
if (ret) {
clk_disable_unprepare(sport->clk_ipg);
return ret;
goto err_clk;
}

if ((sport->port.rs485.flags & SER_RS485_ENABLED) &&
Expand Down Expand Up @@ -2709,7 +2708,7 @@ static int imx_uart_probe(struct platform_device *pdev)
imx_uart_writel(sport, ucr3, UCR3);
}

clk_disable_unprepare(sport->clk_ipg);


hrtimer_init(&sport->trigger_start_tx, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
hrtimer_init(&sport->trigger_stop_tx, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
Expand All @@ -2726,30 +2725,30 @@ static int imx_uart_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev, "failed to request rx irq: %d\n",
ret);
return ret;
goto err_clk;
}

ret = devm_request_irq(&pdev->dev, txirq, imx_uart_txint, 0,
dev_name(&pdev->dev), sport);
if (ret) {
dev_err(&pdev->dev, "failed to request tx irq: %d\n",
ret);
return ret;
goto err_clk;
}

ret = devm_request_irq(&pdev->dev, rtsirq, imx_uart_rtsint, 0,
dev_name(&pdev->dev), sport);
if (ret) {
dev_err(&pdev->dev, "failed to request rts irq: %d\n",
ret);
return ret;
goto err_clk;
}
} else {
ret = devm_request_irq(&pdev->dev, rxirq, imx_uart_int, 0,
dev_name(&pdev->dev), sport);
if (ret) {
dev_err(&pdev->dev, "failed to request irq: %d\n", ret);
return ret;
goto err_clk;
}
}

Expand All @@ -2762,7 +2761,10 @@ static int imx_uart_probe(struct platform_device *pdev)
dev_warn(&pdev->dev, "cound not create sys node\n");
}

return uart_add_one_port(&imx_uart_uart_driver, &sport->port);
ret = uart_add_one_port(&imx_uart_uart_driver, &sport->port);
err_clk:
clk_disable_unprepare(sport->clk_ipg);
return ret;
}

static int imx_uart_remove(struct platform_device *pdev)
Expand Down