From patchwork Tue Aug 11 01:35:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 6987641 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B6CA1C05AD for ; Tue, 11 Aug 2015 01:38:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0BEF20553 for ; Tue, 11 Aug 2015 01:38:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2C2220567 for ; Tue, 11 Aug 2015 01:38:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933536AbbHKBgA (ORCPT ); Mon, 10 Aug 2015 21:36:00 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:36138 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933194AbbHKBf7 (ORCPT ); Mon, 10 Aug 2015 21:35:59 -0400 Received: by pdco4 with SMTP id o4so77465722pdc.3; Mon, 10 Aug 2015 18:35:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mSRcb0v5VmKwHmfeuGZZd+99LkF0W+Z5fUkOY+5CFl0=; b=fiemaIlEtwKMmyu8RiYR0mZNC7P+XhBtL07rslYyhsTzqawqepRmXzClkITojN6jC4 gJM3cHWBbL4+kQD7co+z7sAogqaRfnhKN0RwWdSQb/C6cQDu/w3zGkuir7SMSLQwgLE1 yyxKeIfwySgc73ZUXqOLR0mkUi5be+VRM8zbgik9Y2f4WyTjwcxXZ+0FFQ2vwceGooSv Hd3oF6w91+diEBDPIa+s/nhvgKVkXs5DmA8AwXQb81Cb4dKFP4HrOSrrbYVFreKdJexw 1a7vKSH9Z/ogOTUmrbWSa4Htu86YWOtdxBZxs9WqGpyR8kgFJm0wdUZt3uf78M7+MNs0 vzYw== X-Received: by 10.70.4.3 with SMTP id g3mr50584537pdg.73.1439256958486; Mon, 10 Aug 2015 18:35:58 -0700 (PDT) Received: from localhost (amazon.gigabitethernet4-0-6.asr1.snv2.gblx.net. [64.211.110.86]) by smtp.gmail.com with ESMTPSA id fx4sm288612pbb.92.2015.08.10.18.35.57 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 10 Aug 2015 18:35:57 -0700 (PDT) From: Eduardo Valentin To: Greg Kroah-Hartman , Jiri Slaby , Fabio Estevam Cc: Sascha Hauer , Linux PM , linux-serial@vger.kernel.org, LKML , Eduardo Valentin Subject: [PATCHv2 1/8] serial: imx: remove unbalanced clk_prepare Date: Mon, 10 Aug 2015 18:35:42 -0700 Message-Id: <1439256949-626-2-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1439256949-626-1-git-send-email-edubezval@gmail.com> References: <1439256949-626-1-git-send-email-edubezval@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current code attempts to prepare clk_per and clk_ipg before using the device. However, the result is an extra prepare call on each clock. Here is the output of uart clocks (only uart enabled and used as console): $ grep uart /sys/kernel/debug/clk/clk_summary uart_serial 1 2 80000000 0 0 uart 1 2 66000000 0 0 This patch balances the calls of prepares. The result is: $ grep uart /sys/kernel/debug/clk/clk_summary uart_serial 1 1 80000000 0 0 uart 1 1 66000000 0 0 Cc: Fabio Estevam Cc: Greg Kroah-Hartman Cc: Jiri Slaby Cc: linux-serial@vger.kernel.org Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin --- drivers/tty/serial/imx.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 9a248eb..b27c232 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1630,12 +1630,12 @@ imx_console_write(struct console *co, const char *s, unsigned int count) int locked = 1; int retval; - retval = clk_enable(sport->clk_per); + retval = clk_prepare_enable(sport->clk_per); if (retval) return; - retval = clk_enable(sport->clk_ipg); + retval = clk_prepare_enable(sport->clk_ipg); if (retval) { - clk_disable(sport->clk_per); + clk_disable_unprepare(sport->clk_per); return; } @@ -1674,8 +1674,8 @@ imx_console_write(struct console *co, const char *s, unsigned int count) if (locked) spin_unlock_irqrestore(&sport->port.lock, flags); - clk_disable(sport->clk_ipg); - clk_disable(sport->clk_per); + clk_disable_unprepare(sport->clk_ipg); + clk_disable_unprepare(sport->clk_per); } /* @@ -1776,15 +1776,7 @@ imx_console_setup(struct console *co, char *options) retval = uart_set_options(&sport->port, co, baud, parity, bits, flow); - clk_disable(sport->clk_ipg); - if (retval) { - clk_unprepare(sport->clk_ipg); - goto error_console; - } - - retval = clk_prepare(sport->clk_per); - if (retval) - clk_disable_unprepare(sport->clk_ipg); + clk_disable_unprepare(sport->clk_ipg); error_console: return retval;