From patchwork Thu Jul 31 11:39:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 4655301 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 0A0A7C033A for ; Thu, 31 Jul 2014 11:43:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41B73201C8 for ; Thu, 31 Jul 2014 11:43:14 +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 86DD9201C0 for ; Thu, 31 Jul 2014 11:43:13 +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 1XCojB-0001nx-LB; Thu, 31 Jul 2014 11:40:57 +0000 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XCois-0001bF-Qz for linux-arm-kernel@lists.infradead.org; Thu, 31 Jul 2014 11:40:39 +0000 Received: by mail-wi0-f176.google.com with SMTP id bs8so9176496wib.3 for ; Thu, 31 Jul 2014 04:40:15 -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=iJ2r/9QkOConvqJMWU+5sGKqDxUiHZWYI9cilVSXNJRXVxrvDehPRAOnZV78LqCj8s 6p4EvdqR3o0rjbhMLnAV0qAeqKqy2lvqmJoxnZsAW/tTIlVpCniwU7J0v8RWmXIkUHh+ wYWip/oaBO1OpXbCGtz+P+5eRELryxRFz2n6T91URoStdqDAEcykxydGrohOjz0UMXK3 FB0ZxYb5qU/YvJBKqdDfl9iCRkntbzoPnDJySjZc6jS0ojzO2IVJrXI5hafcJR5bl1mv H0MrmAeIVhQWgoB1iJq3jdOPgd1dyi02I/TA2dJEUBOY7/zbg5kWb0OsL2iWB0OZpBHi 0t0w== X-Received: by 10.194.92.244 with SMTP id cp20mr15114729wjb.135.1406806814834; Thu, 31 Jul 2014 04:40:14 -0700 (PDT) Received: from cizrna.lan (37-48-39-114.tmcz.cz. [37.48.39.114]) by mx.google.com with ESMTPSA id k6sm12815328wjq.5.2014.07.31.04.40.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jul 2014 04:40:14 -0700 (PDT) From: Tomeu Vizoso To: Mike Turquette Subject: [PATCH v4 RESEND 2/6] ASoC: mxs-saif: fix mixed use of public and provider clk API Date: Thu, 31 Jul 2014 13:39:36 +0200 Message-Id: <1406806779-26939-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406806779-26939-1-git-send-email-tomeu.vizoso@collabora.com> References: <1406806779-26939-1-git-send-email-tomeu.vizoso@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140731_044039_023784_BFD7184F X-CRM114-Status: GOOD ( 10.94 ) X-Spam-Score: -0.7 (/) Cc: Tomeu Vizoso , Stephen Warren , Tomasz Figa , linux-kernel@vger.kernel.org, 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, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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);