From patchwork Thu Oct 17 16:30:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 3061931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5D9599F3E2 for ; Thu, 17 Oct 2013 16:32:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B67A320453 for ; Thu, 17 Oct 2013 16:32:14 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C5B6203C4 for ; Thu, 17 Oct 2013 16:32:13 +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 1VWqUH-0007Us-FD; Thu, 17 Oct 2013 16:31:49 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWqUB-0003Gd-Cd; Thu, 17 Oct 2013 16:31:43 +0000 Received: from mailout2.w1.samsung.com ([210.118.77.12]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWqTs-0003BH-Ue for linux-arm-kernel@lists.infradead.org; Thu, 17 Oct 2013 16:31:25 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MUT00FP5N7DIUD0@mailout2.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 17 Oct 2013 17:30:58 +0100 (BST) X-AuditID: cbfec7f5-b7ef66d00000795a-8b-526010c2d997 Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 5C.0D.31066.2C010625; Thu, 17 Oct 2013 17:30:58 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync1.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MUT00F39N7B2000@eusync1.samsung.com>; Thu, 17 Oct 2013 17:30:57 +0100 (BST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/8] clk: max77686: Correct callback used for checking clock status Date: Thu, 17 Oct 2013 18:30:35 +0200 Message-id: <1382027442-1992-2-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.3.2 In-reply-to: <1382027442-1992-1-git-send-email-t.figa@samsung.com> References: <1382027442-1992-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGJMWRmVeSWpSXmKPExsVy+t/xy7qHBBKCDBpOMlrMP3KO1eJs0xt2 i/tfjzJabHp8jdVixvl9TBZPJ1xkszjdzWqxfsZrFgcOjzvX9rB5zDsZ6LF5Sb1H35ZVjB6f N8kFsEZx2aSk5mSWpRbp2yVwZRx4pluwg6vi9sSgBsY3HF2MHBwSAiYSj056djFyApliEhfu rWfrYuTiEBJYyigxYd9xJginj0mi8cpaFpAqNgE1ic8Nj9hAbBEBDYkpXY/ZQYqYBVqYJFat /8wEkhAWCJV4u78NrIFFQFWie/VBdhCbV8BR4mlbExPEOgWJZV/WMoPYnAJOEvMW32IEsYWA av62PmeawMi7gJFhFaNoamlyQXFSeq6RXnFibnFpXrpecn7uJkZIWH3dwbj0mNUhRgEORiUe Xsmf8UFCrIllxZW5hxglOJiVRHjjuBKChHhTEiurUovy44tKc1KLDzEycXBKNTAqzpv9ybqw k9O6fOL69ok8QWvZpi92WCt3/BVb470/LxcXz4n0LM7elnQgPStTUMHuroy/mql8fRC73o6n E9/8NJas/fKsfe4DkbUzz294vsjXnVX4w4v7Pb1NbNNU52mw+7yQcLJ8e79HU/Rr7yPROrOM Hzc/i7Fn1MiwLsjvPK5sYmBoEaHEUpyRaKjFXFScCACUBnbiCQIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131017_123125_132630_E86A186C X-CRM114-Status: GOOD ( 10.28 ) X-Spam-Score: -7.3 (-------) Cc: devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Mike Turquette , Samuel Ortiz , 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.6 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 Signed-off-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] = {