From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-mediatek@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-serial@vger.kernel.org, Alan Cox <alan@linux.intel.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 2/4] tty: serial: 8250_mtk: Use devm_clk_get
Date: Mon, 27 Apr 2015 08:49:55 +0200 [thread overview]
Message-ID: <1430117397-13517-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1430117397-13517-1-git-send-email-s.hauer@pengutronix.de>
When a struct device * is present clk_get should be used rather
than of_clk_get. Use the devm variant of this function to be able to
drop the clk_put in the error and remove pathes. While at it fix
a wrong error message.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/tty/serial/8250/8250_mtk.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index 1297827..bcfaa8dc 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -131,18 +131,16 @@ static int mtk8250_probe_of(struct platform_device *pdev, struct uart_port *p,
struct mtk8250_data *data)
{
int err;
- struct device_node *np = pdev->dev.of_node;
- data->uart_clk = of_clk_get(np, 0);
+ data->uart_clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(data->uart_clk)) {
- dev_warn(&pdev->dev, "Can't get timer clock\n");
+ dev_warn(&pdev->dev, "Can't get uart clock\n");
return PTR_ERR(data->uart_clk);
}
err = clk_prepare_enable(data->uart_clk);
if (err) {
dev_warn(&pdev->dev, "Can't prepare clock\n");
- clk_put(data->uart_clk);
return err;
}
p->uartclk = clk_get_rate(data->uart_clk);
@@ -215,7 +213,6 @@ static int mtk8250_remove(struct platform_device *pdev)
serial8250_unregister_port(data->line);
clk_disable_unprepare(data->uart_clk);
- clk_put(data->uart_clk);
pm_runtime_disable(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev);
--
2.1.4
next prev parent reply other threads:[~2015-04-27 6:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-27 6:49 [PATCH v2] tty: serial: 8250_mtk: Add support for second clock Sascha Hauer
2015-04-27 6:49 ` [PATCH 1/4] tty: serial: 8250_mtk: remove unnecessary test Sascha Hauer
2015-05-04 9:32 ` Matthias Brugger
2015-04-27 6:49 ` Sascha Hauer [this message]
2015-05-04 9:36 ` [PATCH 2/4] tty: serial: 8250_mtk: Use devm_clk_get Matthias Brugger
2015-04-27 6:49 ` [PATCH 3/4] tty: serial: 8250_mtk: use pm_runtime callbacks for enabling Sascha Hauer
2015-05-04 11:05 ` Matthias Brugger
2015-05-04 12:06 ` Sascha Hauer
2015-05-05 15:29 ` Matthias Brugger
2015-04-27 6:49 ` [PATCH 4/4] tty: serial: 8250_mtk: Add support for bus clock Sascha Hauer
2015-05-05 15:41 ` Matthias Brugger
2015-05-05 15:50 ` Sascha Hauer
2015-05-08 8:59 ` Matthias Brugger
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=1430117397-13517-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=alan@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).