From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752874AbbD0Guc (ORCPT ); Mon, 27 Apr 2015 02:50:32 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:38017 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752772AbbD0Gu0 (ORCPT ); Mon, 27 Apr 2015 02:50:26 -0400 From: Sascha Hauer To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, Matthias Brugger , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, Alan Cox , Sascha Hauer Subject: [PATCH 1/4] tty: serial: 8250_mtk: remove unnecessary test Date: Mon, 27 Apr 2015 08:49:54 +0200 Message-Id: <1430117397-13517-2-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1430117397-13517-1-git-send-email-s.hauer@pengutronix.de> References: <1430117397-13517-1-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the driver has probed successfully the clk pointer is always valid, so no need to test for it. Signed-off-by: Sascha Hauer --- drivers/tty/serial/8250/8250_mtk.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index 7a11fac..1297827 100644 --- a/drivers/tty/serial/8250/8250_mtk.c +++ b/drivers/tty/serial/8250/8250_mtk.c @@ -214,10 +214,8 @@ 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_put(data->uart_clk); - } + clk_disable_unprepare(data->uart_clk); + clk_put(data->uart_clk); pm_runtime_disable(&pdev->dev); pm_runtime_put_noidle(&pdev->dev); @@ -249,8 +247,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; } @@ -259,8 +256,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