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: 358500 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F401C1400E0 for ; Wed, 11 Jun 2014 17:20:29 +1000 (EST) Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by lists.ozlabs.org (Postfix) with ESMTP id E242E1A0947 for ; Wed, 11 Jun 2014 17:20:29 +1000 (EST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pb0-x22c.google.com (mail-pb0-x22c.google.com [IPv6:2607:f8b0:400e:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 28EBC1A032B for ; Wed, 11 Jun 2014 17:19:53 +1000 (EST) Received: by mail-pb0-f44.google.com with SMTP id rq2so7113521pbb.31 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 Subject: [PATCH] ASoC: fsl: Fix build problem 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 , Jaroslav Kysela , Mark Brown , Markus Pargmann , Guenter Roeck X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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)