From patchwork Tue Sep 4 12:08:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1401951 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2967E402E1 for ; Tue, 4 Sep 2012 12:08:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756911Ab2IDMIE (ORCPT ); Tue, 4 Sep 2012 08:08:04 -0400 Received: from na3sys009aog107.obsmtp.com ([74.125.149.197]:48324 "EHLO na3sys009aog107.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756871Ab2IDMIC (ORCPT ); Tue, 4 Sep 2012 08:08:02 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]) (using TLSv1) by na3sys009aob107.postini.com ([74.125.148.12]) with SMTP ID DSNKUEXvIR24y3ywBGWmQq1i8f2zUCLapVO/@postini.com; Tue, 04 Sep 2012 05:08:02 PDT Received: by obbuo13 with SMTP id uo13so10750196obb.19 for ; Tue, 04 Sep 2012 05:08:01 -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=vPZuUojwSGUexpMxHZD7e7vXk1gmkWRM+egYnVxJgP4=; b=aAzrLsxfDISKPmdxFioH+Cfaet3Y3Z7ik/OYjNyzqaYLvkUQu3OeKXEy/sMMXPXbSJ b5Gs0jMhjgVLYdd2sSn1MWlUklDElM7ykBgknAEt0zO2vJwnDMZ7LcDEq8fUXQb8pqBS oVMSzoEpOe1XwY+PuFlRE5bmZpAgXeu/+BXS4+YtQNr6E+NDQAZ5IoqQtkuxC0rl/ysv hhkYj/rpO641xEcI6HXr2oCPVMzioewLGuFfyAJaOtHzitbqIccTI+XwCYbIJXOQCGbu G11NfLdbJc4RT6s/FrbdPC9LViZJvYWe7dfYWECmszjdmBKrWIrqJQKb+y5RJMrDMyNX NZRw== Received: by 10.60.25.38 with SMTP id z6mr16488162oef.15.1346760481392; Tue, 04 Sep 2012 05:08:01 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id g8sm14150577obz.16.2012.09.04.05.07.58 (version=SSLv3 cipher=OTHER); Tue, 04 Sep 2012 05:08:00 -0700 (PDT) From: Peter Ujfalusi To: Russell King , Janusz Krzysztofik Cc: Liam Girdwood , Mark Brown , Jarkko Nikula , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Santosh Shilimkar Subject: [RFC update 2/2] ASoC: omap-pcm: Do not check DMA sync_mode Date: Tue, 4 Sep 2012 15:08:02 +0300 Message-Id: <1346760482-12794-3-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1346760482-12794-1-git-send-email-peter.ujfalusi@ti.com> References: <1346760482-12794-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQm1TcSB9EQ8as1jkXgHA74RibGqMq9tLwTm/+NNYOuDzpOJwFAVXa74RAG+tepA/4143dLZ Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org OMAP dmaengine now supports element mode also in cyclic DMA so we do not need to block non PACKET modes. Signed-off-by: Peter Ujfalusi --- sound/soc/omap/omap-pcm.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 50ae048..0f88db3 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -32,7 +32,6 @@ #include #include -#include /* needed just for OMAP_DMA_SYNC_PACKET */ #include "omap-pcm.h" static const struct snd_pcm_hardware omap_pcm_hardware = { @@ -83,15 +82,6 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream, return 0; prtd->dma_data = dma_data; - /* - * This is the only parameter we don't handle with DMA - * engine - so we insist on OMAP_DMA_SYNC_PACKET here. - */ - if (dma_data->sync_mode != OMAP_DMA_SYNC_PACKET) { - pr_warn("ALSA: omap-dma: DMA using non-packet mode?\n"); - return -EINVAL; - } - req = dma_data->dma_req; err = snd_dmaengine_pcm_open(substream, omap_dma_filter_fn, &req); if (err)