From patchwork Thu Jul 17 14:13:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 4578221 Return-Path: X-Original-To: patchwork-alsa-devel@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 870FDC0514 for ; Thu, 17 Jul 2014 19:07:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C00DB201BA for ; Thu, 17 Jul 2014 19:07:27 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id A29A62018E for ; Thu, 17 Jul 2014 19:07:26 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id B6DB92655FA; Thu, 17 Jul 2014 21:07:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id E61802651EA; Thu, 17 Jul 2014 21:06:23 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2C65A265567; Thu, 17 Jul 2014 16:14:11 +0200 (CEST) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by alsa0.perex.cz (Postfix) with ESMTP id 4B38E265551 for ; Thu, 17 Jul 2014 16:14:04 +0200 (CEST) Received: by mail-wi0-f174.google.com with SMTP id d1so7773700wiv.13 for ; Thu, 17 Jul 2014 07:14:03 -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=KcnmqpWN8rIM2uwfwfcmO+Z9Q6zu9+aelark9ZT9w3U=; b=ls3m/4sNcjbAnHLqsup0n+FLecz5wmkG8/aWWwbxtrpY4oG44oOG77827X6d9pEJAR 1Jd6ftXxG6crvIa8sOt4ScJddhSDuwm2eU4GoY1wjx1nfVU1xS+Bz+SmceSLk7lG1Tiy zflQf24ZELdQUzSmMUk39/J+lqppd5uQsl2/H46wxt4Sa6oIjA0PnhRJKYodZHZfYLYP gGq0dg5HNJPaVW464URlE1FD7VYq0NgbNtW2wWynmbf3a1Dhx1aj6bv+hzVR9NBnXSFg NhIxDMIXInQ/XWiRw2IFw6U56xy50z3aPp7JgO+CTh32wulD07dy8/t9Z4E1LpYwSkF2 kj4g== X-Received: by 10.180.212.12 with SMTP id ng12mr23213818wic.9.1405606443441; Thu, 17 Jul 2014 07:14:03 -0700 (PDT) Received: from cizrna.lan (37-48-42-212.tmcz.cz. [37.48.42.212]) by mx.google.com with ESMTPSA id rw4sm6412963wjb.44.2014.07.17.07.13.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 07:14:02 -0700 (PDT) From: Tomeu Vizoso To: Mike Turquette Date: Thu, 17 Jul 2014 16:13:15 +0200 Message-Id: <1405606399-26608-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405606399-26608-1-git-send-email-tomeu.vizoso@collabora.com> References: <1405606399-26608-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailman-Approved-At: Thu, 17 Jul 2014 21:06:19 +0200 Cc: Andrew Lunn , Ulf Hansson , Prashant Gaikwad , Tony Lindgren , Benjamin Herrenschmidt , Tomasz Figa , alsa-devel@alsa-project.org, Thierry Reding , Paul Mackerras , Sylwester Nawrocki , Daniel Walker , linux-arch@vger.kernel.org, Boris Brezillon , linux-samsung-soc@vger.kernel.org, Kukjin Kim , Russell King , =?UTF-8?q?Emilio=20L=C3=B3pez?= , Takashi Iwai , Michal Simek , Kyungmin Park , Kevin Hilman , linux-arm-kernel@lists.infradead.org, patches@opensource.wolfsonmicro.com, Viresh Kumar , David Brown , Anatolij Gustschin , Dinh Nguyen , Sebastian Hesselbarth , Jason Cooper , Arnd Bergmann , Stephen Warren , linux-arm-msm@vger.kernel.org, spear-devel@list.st.com, Barry Song , Mark Brown , linux-rpi-kernel@lists.infradead.org, Ben Dooks , linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org, Sascha Hauer , Shawn Guo , Paul Walmsley , Tomeu Vizoso , Peter De Schrijver , Liam Girdwood , linux-kernel@vger.kernel.org, rabin@rab.in, Bryan Huntsman , Santosh Shilimkar , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , Maxime Ripard , linux-media@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Javier Martinez Canillas , Mauro Carvalho Chehab Subject: [alsa-devel] [PATCH v4 2/6] ASoC: mxs-saif: fix mixed use of public and provider clk API X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.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);