From patchwork Tue Jan 20 04:16:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 5663891 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 C23A49F357 for ; Tue, 20 Jan 2015 04:17:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A06BA203AE for ; Tue, 20 Jan 2015 04:17:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6F30203B0 for ; Tue, 20 Jan 2015 04:17:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751562AbbATEQu (ORCPT ); Mon, 19 Jan 2015 23:16:50 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:47131 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751235AbbATEQt (ORCPT ); Mon, 19 Jan 2015 23:16:49 -0500 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 20 Jan 2015 13:16:48 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 8BD4E45042; Tue, 20 Jan 2015 13:16:48 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 85D7A2806E; Tue, 20 Jan 2015 13:16:48 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 805652806D; Tue, 20 Jan 2015 13:16:48 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id PBR08855; Tue, 20 Jan 2015 13:16:48 +0900 X-IronPort-AV: E=Sophos;i="5.09,431,1418050800"; d="scan'208";a="179095418" Received: from mail-sg1lp0093.outbound.protection.outlook.com (HELO APAC01-SG1-obe.outbound.protection.outlook.com) ([207.46.51.93]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 Jan 2015 13:16:47 +0900 Received: from remon.renesas.com (211.11.155.132) by SIXPR06MB175.apcprd06.prod.outlook.com (10.242.151.22) with Microsoft SMTP Server (TLS) id 15.1.59.20; Tue, 20 Jan 2015 04:16:45 +0000 Message-ID: <87fvb6axwk.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 4/8 v2] 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 , Arnd Bergmann , Ulf Hansson , Brian Norris , Mark Brown , Mark Brown CC: , Simon , Rob Herring , Linux-SH , Laurent In-Reply-To: <87lhkyaxzs.wl%kuninori.morimoto.gx@renesas.com> References: <87ppafxy1f.wl%kuninori.morimoto.gx@renesas.com> <87lhkyaxzs.wl%kuninori.morimoto.gx@renesas.com> Date: Tue, 20 Jan 2015 04:16:45 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: SINPR01CA0042.apcprd01.prod.exchangelabs.com (10.141.109.42) To SIXPR06MB175.apcprd06.prod.outlook.com (10.242.151.22) 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:SIXPR06MB175; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:SIXPR06MB175; X-Forefront-PRVS: 0462918D61 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(77096005)(76176999)(64706001)(47776003)(83506001)(50466002)(229853001)(46102003)(86362001)(2950100001)(69596002)(19580405001)(68736005)(106356001)(66066001)(92566002)(42186005)(46406003)(40100003)(23726002)(87976001)(62966003)(77156002)(50986999)(105586002)(54356999)(81156004)(36756003)(53416004)(122386002)(33646002)(97736003)(19580395003)(101416001); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB175; 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:SIXPR06MB175; X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2015 04:16:45.5600 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB175 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=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 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 --- v1 -> v2 - separate into shdma and others 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);