From patchwork Fri Jun 28 18:17:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2800411 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 AAE53BF4A1 for ; Fri, 28 Jun 2013 18:19:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 941D2201CB for ; Fri, 28 Jun 2013 18:19:04 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97E66201B2 for ; Fri, 28 Jun 2013 18:19:03 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsdFk-0001VZ-Gj; Fri, 28 Jun 2013 18:18:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsdFd-0003QO-Ut; Fri, 28 Jun 2013 18:18:29 +0000 Received: from mail-pb0-f54.google.com ([209.85.160.54]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UsdFS-0003Ot-Us for linux-arm-kernel@lists.infradead.org; Fri, 28 Jun 2013 18:18:19 +0000 Received: by mail-pb0-f54.google.com with SMTP id ro2so2572539pbb.41 for ; Fri, 28 Jun 2013 11:17:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=xgnE2VHZeKCEDx8ei/KWZ6iYnF6m0rLOwe4q0fNWBw4=; b=Jx3/0oHcsXi9GALRyiAV5Yc+GH3Y+hZ31qJbzpqQuDooAeEsOJhFwS+fTepNvAwO4d ArzXEwOp9haynyRT703aMsU4qae/A2cRbeipzbiOfeSlJmkZuW8TECDO68htPU3MiniI tEBWsR49Q8wV4CiJTKlTOVHuazbomFOhcmH/g3dLnHfKToyjDo8UhDXm3ePpKrbr9LxR Y51NhvrKEXNLiI5Zgrz0Z1spSbErpBZJB1Ql+XsCuKfYruim3xhTm9N+GHnmtac3Db6B t2lCFrC6qzL/+j0uqwaGvPEpMtpR9h6phGLal67JVETUQHn9D1QoYU0M2ZxMuL/6zOoJ oOeA== X-Received: by 10.66.141.4 with SMTP id rk4mr12530141pab.127.1372443476363; Fri, 28 Jun 2013 11:17:56 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPSA id bs2sm10052089pad.17.2013.06.28.11.17.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Jun 2013 11:17:54 -0700 (PDT) From: Kevin Hilman To: Mark Brown , alsa-devel@alsa-project.org Subject: [PATCH 1/2] ASoC: ac97: pxa2xx: fixup multi-platform AC'97 build failures Date: Fri, 28 Jun 2013 11:17:48 -0700 Message-Id: <1372443469-20191-2-git-send-email-khilman@linaro.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1372443469-20191-1-git-send-email-khilman@linaro.org> References: <1372443469-20191-1-git-send-email-khilman@linaro.org> X-Gm-Message-State: ALoCoQk92RV24MgG/ZHrJixcwamCu9REjA3RyTuBTDwv8UArUP/ex8GkH9rpVqlIYSLg9bAjf2YI X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130628_141819_078231_58C1B373 X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -2.6 (--) Cc: Olof Johansson , linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Mark Brown X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 commit b047e1cc (ASoC: ac97: Support multi-platform AC'97) introduced some build failures for the pxa2xx-ac97 support, fix them. Cc: Mark Brown Signed-off-by: Kevin Hilman --- sound/soc/pxa/pxa2xx-ac97.c | 2 ++ sound/soc/pxa/pxa2xx-ac97.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index a3c22ba..1475515 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -238,6 +238,8 @@ static const struct snd_soc_component_driver pxa_ac97_component = { static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { + int ret; + if (pdev->id != -1) { dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n"); return -ENXIO; diff --git a/sound/soc/pxa/pxa2xx-ac97.h b/sound/soc/pxa/pxa2xx-ac97.h index eda891e..a49c21b 100644 --- a/sound/soc/pxa/pxa2xx-ac97.h +++ b/sound/soc/pxa/pxa2xx-ac97.h @@ -14,7 +14,4 @@ #define PXA2XX_DAI_AC97_AUX 1 #define PXA2XX_DAI_AC97_MIC 2 -/* platform data */ -extern struct snd_ac97_bus_ops pxa2xx_ac97_ops; - #endif