From patchwork Wed Jan 21 04:14:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 5674421 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 AE7F59F9B1 for ; Wed, 21 Jan 2015 04:15:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3197204D1 for ; Wed, 21 Jan 2015 04:15:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E3E3204CF for ; Wed, 21 Jan 2015 04:15:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754127AbbAUEPD (ORCPT ); Tue, 20 Jan 2015 23:15:03 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:51479 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753448AbbAUEPB (ORCPT ); Tue, 20 Jan 2015 23:15:01 -0500 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 21 Jan 2015 13:15:00 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 40F143E764; Wed, 21 Jan 2015 13:15:00 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 3DBE78002F; Wed, 21 Jan 2015 13:15:00 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 384258002D; Wed, 21 Jan 2015 13:15:00 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id PAA12744; Wed, 21 Jan 2015 13:15:00 +0900 X-IronPort-AV: E=Sophos;i="5.09,439,1418050800"; d="scan'208";a="178106686" 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; 21 Jan 2015 13:14:58 +0900 Received: from remon.renesas.com (211.11.155.132) by HKNPR06MB162.apcprd06.prod.outlook.com (10.242.104.19) with Microsoft SMTP Server (TLS) id 15.1.59.20; Wed, 21 Jan 2015 04:14:56 +0000 Message-ID: <87a91cojk7.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 4/8 v3] mtd: sh_flctl: 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:14:56 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: HKXPR03CA0053.apcprd03.prod.outlook.com (10.141.129.43) To HKNPR06MB162.apcprd06.prod.outlook.com (10.242.104.19) 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:HKNPR06MB162; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:HKNPR06MB162; X-Forefront-PRVS: 04631F8F77 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(83506001)(92566002)(23726002)(40100003)(122386002)(77156002)(62966003)(47776003)(64706001)(50466002)(66066001)(36756003)(97736003)(87976001)(86362001)(54356999)(76176999)(46102003)(106356001)(50986999)(81156004)(19580405001)(19580395003)(2950100001)(105586002)(33646002)(46406003)(101416001)(68736005)(53416004)(69596002)(77096005)(229853001)(42186005); DIR:OUT; SFP:1102; SCL:1; SRVR:HKNPR06MB162; H:remon.renesas.com; FPR:; SPF:None; MLV:sfv; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:HKNPR06MB162; X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2015 04:14:56.7997 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKNPR06MB162 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: Arnd Bergmann Current sh_flctl sets dma_slave_config :: slave_id field for DMAEngine, but it is no longer needed. Let's remove it. Signed-off-by: Arnd Bergmann Signed-off-by: Kuninori Morimoto --- v2 -> v3 - no change drivers/mtd/nand/sh_flctl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index a21c378..c3ce81c 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c @@ -159,7 +159,6 @@ static void flctl_setup_dma(struct sh_flctl *flctl) return; memset(&cfg, 0, sizeof(cfg)); - cfg.slave_id = pdata->slave_id_fifo0_tx; cfg.direction = DMA_MEM_TO_DEV; cfg.dst_addr = (dma_addr_t)FLDTFIFO(flctl); cfg.src_addr = 0; @@ -175,7 +174,6 @@ static void flctl_setup_dma(struct sh_flctl *flctl) if (!flctl->chan_fifo0_rx) goto err; - cfg.slave_id = pdata->slave_id_fifo0_rx; cfg.direction = DMA_DEV_TO_MEM; cfg.dst_addr = 0; cfg.src_addr = (dma_addr_t)FLDTFIFO(flctl);