From patchwork Thu Dec 12 16:07:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3332901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 396D7C0D4A for ; Thu, 12 Dec 2013 16:08:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88B65207C6 for ; Thu, 12 Dec 2013 16:08:27 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD0D820795 for ; Thu, 12 Dec 2013 16:08:22 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8oD-0001R1-Dl; Thu, 12 Dec 2013 16:08:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8oA-00018R-8f; Thu, 12 Dec 2013 16:08:14 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vr8o4-00015u-24 for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 16:08:09 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXP007HJBGV7U60@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 12 Dec 2013 16:07:43 +0000 (GMT) X-AuditID: cbfec7f4-b7f966d0000003d9-3f-52a9df4f5ea1 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id D6.EC.00985.F4FD9A25; Thu, 12 Dec 2013 16:07:43 +0000 (GMT) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MXP00BIHBGQS260@eusync3.samsung.com>; Thu, 12 Dec 2013 16:07:43 +0000 (GMT) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/8] clk: max77686: Correct callback used for checking clock status Date: Thu, 12 Dec 2013 17:07:14 +0100 Message-id: <1386864441-19561-2-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.4.3 In-reply-to: <1386864441-19561-1-git-send-email-t.figa@samsung.com> References: <1386864441-19561-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDJMWRmVeSWpSXmKPExsVy+t/xq7r+91cGGdzbomgx/8g5VouzTW/Y Le5/PcposenxNVaLGef3MVk8nXCRzeLkn15Gi9PdrBbrZ7xmceD0uHNtD5vHvJOBHpuX1Hv0 bVnF6PF5k1wAaxSXTUpqTmZZapG+XQJXxtYnG1kLNnNVbOwsbGB8ztHFyMEhIWAi8WwFSxcj J5ApJnHh3nq2LkYuDiGBpYwSWxa+hXL6mCQent3LBFLFJqAm8bnhERuILSKgITGl6zE7SBGz wBomid7NU1lBEsICERINL3eANbAIqEosXLgaLM4r4CRxZ3YzO8Q6BYnONf8ZQWxOAWeJG4dn g9lCQDXbFk9in8DIu4CRYRWjaGppckFxUnquoV5xYm5xaV66XnJ+7iZGSIh92cG4+JjVIUYB DkYlHt4XB1cECbEmlhVX5h5ilOBgVhLhvbdlZZAQb0piZVVqUX58UWlOavEhRiYOTqkGxo4t Ggs+xaiGpl/lXKh402brdNftywulpkkalVQoFsVIb+/c49c2cWPyNL+bzk4vNq6ZuDDi1Fsp jmKDLIbHZWXMTU++d6348f5CuTZP6/svAVEfUrvmpFepblg6R4jlg+ym5bs3LVvj0OB95ZLy 2zcLrz9IqvPkCJ487+XsL/PmnXKtq30/rVOJpTgj0VCLuag4EQAjI1seDwIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_110808_202791_133B73FF X-CRM114-Status: GOOD ( 10.17 ) X-Spam-Score: -6.9 (------) Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Mike Turquette , Samuel Ortiz , Sachin Kamat , Tomasz Figa , Kyungmin Park , Lee Jones X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Changing status of clock gates in max77686 requires i2c transfers, which can sleep, so this is done in prepare and unprepare callbacks. Due to this, checking whether whether the clock is ungated must be done in is_prepared() callback as well, for consistency. Signed-off-by: Tomasz Figa Acked-by: Kyungmin Park --- drivers/clk/clk-max77686.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c index 9f57bc3..e39d463 100644 --- a/drivers/clk/clk-max77686.c +++ b/drivers/clk/clk-max77686.c @@ -66,7 +66,7 @@ static void max77686_clk_unprepare(struct clk_hw *hw) MAX77686_REG_32KHZ, max77686->mask, ~max77686->mask); } -static int max77686_clk_is_enabled(struct clk_hw *hw) +static int max77686_clk_is_prepared(struct clk_hw *hw) { struct max77686_clk *max77686 = to_max77686_clk(hw); int ret; @@ -84,7 +84,7 @@ static int max77686_clk_is_enabled(struct clk_hw *hw) static struct clk_ops max77686_clk_ops = { .prepare = max77686_clk_prepare, .unprepare = max77686_clk_unprepare, - .is_enabled = max77686_clk_is_enabled, + .is_prepared = max77686_clk_is_prepared, }; static struct clk_init_data max77686_clks_init[MAX77686_CLKS_NUM] = {