From patchwork Thu Aug 14 12:11:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 4723891 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 DE218C0338 for ; Thu, 14 Aug 2014 12:14:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1E9D2201EF for ; Thu, 14 Aug 2014 12:14:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 E1F462015A for ; Thu, 14 Aug 2014 12:14:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XHttq-0007a0-V0; Thu, 14 Aug 2014 12:12:58 +0000 Received: from mail-wg0-f46.google.com ([74.125.82.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XHttS-0007ET-RA for linux-arm-kernel@lists.infradead.org; Thu, 14 Aug 2014 12:12:35 +0000 Received: by mail-wg0-f46.google.com with SMTP id m15so982702wgh.17 for ; Thu, 14 Aug 2014 05:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=s2ZKr3tMgMBjh07JP6+yc1e7ZRQVIlS+t+LttuC2wnk=; b=ZI9mgTjYC4VtJd+H2XERMWTfGSxgbnpbBbyj/zC39SAWn529Kzwno7cj1LTVdMVRCM CfaixK+6ibgDBBHAxyw+rx41GYZnwfUaJht4XUHT8lVLLBuohPVCvHimY8tD+m3+1AWx 0IqDYWbVCbJkL0BQxKHSgis16hPrbeZp9TMwTM/YVCdxIt05KIg9D2yc1XvcvTcETaiD vVvdNMK626T2b1nDVaKGGtU3GnzUlDOIB5giJgslNyhEx+NLU7deh3N62rijTkjd1lUW CpGSp9yhujzynOwtS6CQsh/v3Dtbh1C5odcZ6wshb2YWcin4aYExSsJhNtl8MkDpnvuH tE6Q== X-Received: by 10.194.19.200 with SMTP id h8mr11245682wje.40.1408018331191; Thu, 14 Aug 2014 05:12:11 -0700 (PDT) Received: from cizrna.lan (37-48-38-123.tmcz.cz. [37.48.38.123]) by mx.google.com with ESMTPSA id jx10sm11124810wjc.7.2014.08.14.05.12.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Aug 2014 05:12:10 -0700 (PDT) From: Tomeu Vizoso To: Mike Turquette Subject: [PATCH v6 2/6] ASoC: mxs-saif: fix mixed use of public and provider clk API Date: Thu, 14 Aug 2014 14:11:24 +0200 Message-Id: <1408018287-14217-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1408018287-14217-1-git-send-email-tomeu.vizoso@collabora.com> References: <1408018287-14217-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140814_051235_048385_9B684DD6 X-CRM114-Status: GOOD ( 10.55 ) X-Spam-Score: -0.7 (/) Cc: Tomeu Vizoso , Stephen Warren , Tomasz Figa , linux-kernel@vger.kernel.org, Javier Martinez Canillas , rabin@rab.in, Thierry Reding , Peter De Schrijver , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,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 In preparation to changing the clk provider API to use struct clk_core instead of struct clk. Signed-off-by: Tomeu Vizoso Acked-by: Mark Brown --- sound/soc/mxs/mxs-saif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 231d7e7..a24367d 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -682,11 +682,11 @@ static int mxs_saif_mclk_init(struct platform_device *pdev) { struct mxs_saif *saif = platform_get_drvdata(pdev); struct device_node *np = pdev->dev.of_node; - struct clk *clk; + struct clk_core *clk; int ret; clk = clk_register_divider(&pdev->dev, "mxs_saif_mclk", - __clk_get_name(saif->clk), 0, + clk_get_name(saif->clk), 0, saif->base + SAIF_CTRL, BP_SAIF_CTRL_BITCLK_MULT_RATE, 3, 0, NULL);