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: remove unnecessary test
Date: Thu, 23 Apr 2015 10:51:04 +0200 [thread overview]
Message-ID: <1429779066-21406-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1429779066-21406-1-git-send-email-s.hauer@pengutronix.de>
When the driver has probed successfully the clk pointer is always valid,
so no need to test for it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/tty/serial/8250/8250_mtk.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index c6901dc..bcfaa8dc 100644
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -212,9 +212,7 @@ static int mtk8250_remove(struct platform_device *pdev)
pm_runtime_get_sync(&pdev->dev);
serial8250_unregister_port(data->line);
- if (!IS_ERR(data->uart_clk)) {
- clk_disable_unprepare(data->uart_clk);
- }
+ clk_disable_unprepare(data->uart_clk);
pm_runtime_disable(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev);
@@ -246,8 +244,7 @@ static int mtk8250_runtime_suspend(struct device *dev)
{
struct mtk8250_data *data = dev_get_drvdata(dev);
- if (!IS_ERR(data->uart_clk))
- clk_disable_unprepare(data->uart_clk);
+ clk_disable_unprepare(data->uart_clk);
return 0;
}
@@ -256,8 +253,7 @@ static int mtk8250_runtime_resume(struct device *dev)
{
struct mtk8250_data *data = dev_get_drvdata(dev);
- if (!IS_ERR(data->uart_clk))
- clk_prepare_enable(data->uart_clk);
+ clk_prepare_enable(data->uart_clk);
return 0;
}
--
2.1.4
next prev parent reply other threads:[~2015-04-23 8:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-23 8:51 tty: serial: 8250_mtk: Add support for second clock Sascha Hauer
2015-04-23 8:51 ` [PATCH 1/4] tty: serial: 8250_mtk: Use devm_clk_get Sascha Hauer
2015-04-24 10:28 ` Matthias Brugger
2015-04-24 10:31 ` Sascha Hauer
2015-04-24 10:53 ` Matthias Brugger
2015-04-24 10:56 ` Matthias Brugger
2015-04-27 6:33 ` Sascha Hauer
2015-04-23 8:51 ` Sascha Hauer [this message]
2015-04-23 8:51 ` [PATCH 3/4] tty: serial: 8250_mtk: use pm_runtime callbacks for enabling Sascha Hauer
2015-04-23 8:51 ` [PATCH 4/4] tty: serial: 8250_mtk: Add support for bus clock Sascha Hauer
2015-04-24 11:18 ` 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=1429779066-21406-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).