From patchwork Thu Feb 19 03:53:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 5849931 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 580C79F269 for ; Thu, 19 Feb 2015 03:53:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76F6C2021F for ; Thu, 19 Feb 2015 03:53:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9386C20221 for ; Thu, 19 Feb 2015 03:53:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751940AbbBSDxH (ORCPT ); Wed, 18 Feb 2015 22:53:07 -0500 Received: from relmlor3.renesas.com ([210.160.252.173]:25655 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751793AbbBSDxF (ORCPT ); Wed, 18 Feb 2015 22:53:05 -0500 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 19 Feb 2015 12:53:04 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id D2051420A1; Thu, 19 Feb 2015 12:53:04 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id B5635480A4; Thu, 19 Feb 2015 12:53:04 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id AF580480A3; Thu, 19 Feb 2015 12:53:04 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id NAJ16372; Thu, 19 Feb 2015 12:53:04 +0900 X-IronPort-AV: E=Sophos;i="5.09,606,1418050800"; d="scan'208";a="180168117" Received: from mail-sg1lp0087.outbound.protection.outlook.com (HELO APAC01-SG1-obe.outbound.protection.outlook.com) ([207.46.51.87]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 19 Feb 2015 12:53:03 +0900 Received: from HKXPR06MB166.apcprd06.prod.outlook.com (10.242.124.18) by HKXPR06MB358.apcprd06.prod.outlook.com (10.141.133.152) with Microsoft SMTP Server (TLS) id 15.1.87.18; Thu, 19 Feb 2015 03:53:02 +0000 Received: from remon.renesas.com (211.11.155.132) by HKXPR06MB166.apcprd06.prod.outlook.com (10.242.124.18) with Microsoft SMTP Server (TLS) id 15.1.87.18; Thu, 19 Feb 2015 03:53:00 +0000 Message-ID: <87bnkq1rpv.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 14/19] ASoC: rsnd: remove rsnd_dma::dir User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Vinod Koul , Mark Brown , "Arnd Bergmann" CC: Simon , Linux-SH , Linux-ALSA , Liam Girdwood , Laurent In-Reply-To: <87vbiy1rul.wl%kuninori.morimoto.gx@renesas.com> References: <87vbiy1rul.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Date: Thu, 19 Feb 2015 03:53:00 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: SIXPR06CA0043.apcprd06.prod.outlook.com (25.160.171.161) To HKXPR06MB166.apcprd06.prod.outlook.com (10.242.124.18) Authentication-Results: intel.com; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB166; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005003); SRVR:HKXPR06MB166; X-Forefront-PRVS: 0492FD61DD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(66066001)(122386002)(19580395003)(42186005)(229853001)(47776003)(2950100001)(76176999)(86362001)(53416004)(33646002)(87976001)(50986999)(23726002)(46406003)(46102003)(77096005)(36756003)(62966003)(50466002)(40100003)(19580405001)(83506001)(54356999)(77156002)(92566002); DIR:OUT; SFP:1102; SCL:1; SRVR:HKXPR06MB166; H:remon.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB166; X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2015 03:53:00.9808 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKXPR06MB166 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:HKXPR06MB358; X-OriginatorOrg: renesas.com Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 From: Kuninori Morimoto DMAEngine direction can be calculated from rsnd_dai_stream, So, rsnd_dma::dir does not make sense now. Let's remove it. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/dma.c | 5 ++--- sound/soc/sh/rcar/rsnd.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 2ab00e8..c03e769 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -91,12 +91,13 @@ static void rsnd_dmaen_start(struct rsnd_dma *dma) struct snd_pcm_substream *substream = io->substream; struct device *dev = rsnd_priv_to_dev(priv); struct dma_async_tx_descriptor *desc; + int is_play = rsnd_io_is_play(io); desc = dmaengine_prep_dma_cyclic(dma->chan, substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), snd_pcm_lib_period_bytes(substream), - dma->dir, + is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc) { @@ -160,8 +161,6 @@ static int rsnd_dmaen_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id, if (ret < 0) goto rsnd_dma_init_err; - dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; - return 0; rsnd_dma_init_err: diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 9e67142..dccf2ef 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -182,7 +182,6 @@ struct rsnd_dma_ops { struct rsnd_dma { struct dma_chan *chan; struct rsnd_dma_ops *ops; - enum dma_transfer_direction dir; dma_addr_t addr; int dmapp_id; u32 chcr;