From patchwork Wed Jan 21 04:15:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 5674491 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3FE56C058D for ; Wed, 21 Jan 2015 04:15:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F44520303 for ; Wed, 21 Jan 2015 04:15:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 774C1204D1 for ; Wed, 21 Jan 2015 04:15:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752283AbbAUEPz (ORCPT ); Tue, 20 Jan 2015 23:15:55 -0500 Received: from relmlor3.renesas.com ([210.160.252.173]:31379 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751691AbbAUEPy (ORCPT ); Tue, 20 Jan 2015 23:15:54 -0500 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 21 Jan 2015 13:15:53 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id A20173E84E; Wed, 21 Jan 2015 13:15:53 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 9DD97480A4; Wed, 21 Jan 2015 13:15:53 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 97E64480A3; Wed, 21 Jan 2015 13:15:53 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id PAN26875; Wed, 21 Jan 2015 13:15:53 +0900 X-IronPort-AV: E=Sophos;i="5.09,439,1418050800"; d="scan'208";a="179231849" Received: from mail-sg1lp0094.outbound.protection.outlook.com (HELO APAC01-SG1-obe.outbound.protection.outlook.com) ([207.46.51.94]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 21 Jan 2015 13:15:52 +0900 Received: from remon.renesas.com (211.11.155.132) by SIXPR06MB174.apcprd06.prod.outlook.com (10.242.151.18) with Microsoft SMTP Server (TLS) id 15.1.59.20; Wed, 21 Jan 2015 04:15:50 +0000 Message-ID: <8761c0ojiq.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 7/8 v3] ASoC: fsi: remove slave_id settings for DMAEngine User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") To: Vinod Koul , Ulf Hansson , Mark Brown , Mark Brown , Arnd Bergmann CC: Simon , Linux-SH , Laurent , In-Reply-To: <87fvb4ojo4.wl%kuninori.morimoto.gx@renesas.com> References: <87ppafxy1f.wl%kuninori.morimoto.gx@renesas.com> <87fvb4ojo4.wl%kuninori.morimoto.gx@renesas.com> Date: Wed, 21 Jan 2015 04:15:50 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: HKNPR06CA0024.apcprd06.prod.outlook.com (10.141.16.14) To SIXPR06MB174.apcprd06.prod.outlook.com (10.242.151.18) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-DmarcAction-Test: None X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(3005004);SRVR:SIXPR06MB174; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:SIXPR06MB174; X-Forefront-PRVS: 04631F8F77 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(199003)(189002)(50466002)(86362001)(40100003)(106356001)(69596002)(105586002)(2950100001)(66066001)(87976001)(50986999)(229853001)(76176999)(54356999)(68736005)(46406003)(77096005)(19580405001)(47776003)(19580395003)(97736003)(53416004)(101416001)(92566002)(77156002)(83506001)(33646002)(64706001)(62966003)(36756003)(81156004)(46102003)(23726002)(42186005)(122386002); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB174; H:remon.renesas.com; FPR:; SPF:None; MLV:sfv; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB174; X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2015 04:15:50.7735 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB174 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 Current fsi sets dma_slave_config :: slave_id field for DMAEngine, but it is no longer needed. Let's remove it. This patch also removed 0 settings of cfg dst_addr/src_addr, because it is not used from DT (= it is assuming these settings are came from platform data). Signed-off-by: Kuninori Morimoto Acked-by: Arnd Bergmann --- v2 -> v3 - add Arnd's Acked-by sound/soc/sh/fsi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index b87b22e..0b6b383 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1371,12 +1371,9 @@ static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct dev shdma_chan_filter, (void *)io->dma_id, dev, is_play ? "tx" : "rx"); if (io->chan) { - struct dma_slave_config cfg; + struct dma_slave_config cfg = {}; int ret; - cfg.slave_id = io->dma_id; - cfg.dst_addr = 0; /* use default addr */ - cfg.src_addr = 0; /* use default addr */ cfg.direction = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM; ret = dmaengine_slave_config(io->chan, &cfg);