From: Wei Yongjun <weiyongjun1@huawei.com>
To: kernel-janitors@vger.kernel.org
Subject: [PATCH -next] serial: milbeaut_usio: Fix error handling in probe and remove
Date: Thu, 25 Apr 2019 15:10:44 +0000 [thread overview]
Message-ID: <20190425151044.105045-1-weiyongjun1@huawei.com> (raw)
devm_clk_get() is used so there is no reason to explicitly call
clk_put() in probe or remove functions. Also remove duplicate assign
for port->membase.
Fixes: ba44dc043004 ("serial: Add Milbeaut serial control")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/tty/serial/milbeaut_usio.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/tty/serial/milbeaut_usio.c b/drivers/tty/serial/milbeaut_usio.c
index d303b7d4bb20..b960d531300c 100644
--- a/drivers/tty/serial/milbeaut_usio.c
+++ b/drivers/tty/serial/milbeaut_usio.c
@@ -525,8 +525,6 @@ static int mlb_usio_probe(struct platform_device *pdev)
ret = -ENODEV;
goto failed;
}
- port->mapbase = res->start;
- port->membase = ioremap(res->start, (res->end - res->start + 1));
port->membase = devm_ioremap(&pdev->dev, res->start,
resource_size(res));
@@ -548,16 +546,12 @@ static int mlb_usio_probe(struct platform_device *pdev)
ret = uart_add_one_port(&mlb_usio_uart_driver, port);
if (ret) {
dev_err(&pdev->dev, "Adding port failed: %d\n", ret);
- goto failed1;
+ goto failed;
}
return 0;
-failed1:
- iounmap(port->membase);
-
failed:
clk_disable_unprepare(clk);
- clk_put(clk);
return ret;
}
@@ -569,7 +563,6 @@ static int mlb_usio_remove(struct platform_device *pdev)
uart_remove_one_port(&mlb_usio_uart_driver, port);
clk_disable_unprepare(clk);
- clk_put(clk);
return 0;
}
next reply other threads:[~2019-04-25 15:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 15:10 Wei Yongjun [this message]
2019-04-26 10:39 ` [PATCH -next] serial: milbeaut_usio: Fix error handling in probe and remove Sugaya, Taichi
2019-04-30 9:35 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190425151044.105045-1-weiyongjun1@huawei.com \
--to=weiyongjun1@huawei.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox