From patchwork Wed Jun 11 07:13:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4333861 Return-Path: X-Original-To: patchwork-alsa-devel@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 A2BC89F333 for ; Wed, 11 Jun 2014 07:20:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D1DE5202EC for ; Wed, 11 Jun 2014 07:20:16 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 94C3320256 for ; Wed, 11 Jun 2014 07:20:15 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id AAB6326569D; Wed, 11 Jun 2014 09:20:13 +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, NO_DNS_FOR_FROM, 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 6A6EC26569D; Wed, 11 Jun 2014 09:20:03 +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 9976E2656A0; Wed, 11 Jun 2014 09:20:01 +0200 (CEST) Received: from mail-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by alsa0.perex.cz (Postfix) with ESMTP id 561CC2654A7 for ; Wed, 11 Jun 2014 09:19:53 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id rq2so7164806pbb.3 for ; Wed, 11 Jun 2014 00:19:51 -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; bh=vMIZkmx3v2NMlGVJPdPYNruQ/Zk3MfEZ4KZjFTBhnAI=; b=SQX4gCZ+dz++s+16MlyM2BiYgIudhTY+vOTykzm8YYPGroO+lGuxiMWMW/vxaYJjeO H7PZ5zoKLLI7ry3jxkiLKhFws81wIXHy9xq6RQmCTHsvvyA/EgpNToAzkEb47R28hQBQ IEGiGUMQ1LD2hrez4M85c5VpfbtV1DlSp0r/Bb8GGkGMXjlQpTyR9a/3Dvml1WJ/3Twf EDhgC++49iTv4GzCrYTGI0t3+ZPxyGA/l2OVGG58CGmnMElKnm4TpUup09EvSn/1Ue/3 0suXsAnhn6dNQBNzexZVZPuLfYfGrsbbnbMcVmFeKWXLZJQOhgubB3zfhNCiFp2xtWdB gpmA== X-Received: by 10.68.181.67 with SMTP id du3mr2851514pbc.96.1402471191244; Wed, 11 Jun 2014 00:19:51 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id qj3sm73189314pbc.91.2014.06.11.00.19.49 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 11 Jun 2014 00:19:50 -0700 (PDT) From: Guenter Roeck To: linuxppc-dev@lists.ozlabs.org Date: Wed, 11 Jun 2014 00:13:52 -0700 Message-Id: <1402470832-24889-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 Cc: alsa-devel@alsa-project.org, Liam Girdwood , Takashi Iwai , Timur Tabi , Mark Brown , Markus Pargmann , Guenter Roeck Subject: [alsa-devel] [PATCH] ASoC: fsl: Fix build problem 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 Commit 432481220 (ASoC: fsl-ssi: Use regmap) removed struct ccsr_ssi. Unfortunately, the structure is still used. This causes mpc85xx_smp_defconfig and mpc85xx_defconfig builds to fail with sound/soc/fsl/fsl_dma.c:926:50: error: invalid use of undefined type 'struct ccsr_ssi' dma->ssi_stx_phys = res.start + offsetof(struct ccsr_ssi, stx0); ound/soc/fsl/fsl_dma.c:927:50: error: invalid use of undefined type 'struct ccsr_ssi' dma->ssi_srx_phys = res.start + offsetof(struct ccsr_ssi, srx0); Fix by using constants, similar to original commit. Cc: Markus Pargmann Signed-off-by: Guenter Roeck --- sound/soc/fsl/fsl_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 6bb0ea5..a609aaf 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -923,8 +923,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) dma->dai.pcm_free = fsl_dma_free_dma_buffers; /* Store the SSI-specific information that we need */ - dma->ssi_stx_phys = res.start + offsetof(struct ccsr_ssi, stx0); - dma->ssi_srx_phys = res.start + offsetof(struct ccsr_ssi, srx0); + dma->ssi_stx_phys = res.start + CCSR_SSI_STX0; + dma->ssi_srx_phys = res.start + CCSR_SSI_SRX0; iprop = of_get_property(ssi_np, "fsl,fifo-depth", NULL); if (iprop)