From patchwork Tue Jul 13 18:41:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Gong X-Patchwork-Id: 12373623 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00, DATE_IN_FUTURE_06_12,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDC44C07E96 for ; Tue, 13 Jul 2021 10:53:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B6F3661284 for ; Tue, 13 Jul 2021 10:53:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B6F3661284 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7y90OBT4R9vf/oNVUGe+9xsLg/TXrnXje7xhXEm+EqE=; b=o70TAgTf3I5uf2 KqV4wTI0uzc5ECOHd9U8PFhfNSVAy8eIus5wuYgsTLSaIh/prUrziRN9uYf4bqouZ92Nm8LyUQoQJ o3tqX1f39dlrhaD0lu0ighqO6F/e0wowwhHYGUt/IUctALmQ63G2G5+/DrZYceCJIWCVMzjXpaAGZ qhb1CnA8HFliwZSIBi7xX7yw3O3R6FRMKE2FDS/PA2qDgzHNpl0ON/jj45kcQRyeZgLnxXUtTTsQG 7GWxcKiZaeygEBBybA7OCFuJAM9K914B1Qp83Bn0tJ2vQHQVPW3uanUcsthQIFg+GNHPZ5C6xaoz2 9WNRueN55pVeUQ+pQgsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3Fzv-00A1zp-Pm; Tue, 13 Jul 2021 10:50:47 +0000 Received: from mail-eopbgr20067.outbound.protection.outlook.com ([40.107.2.67] helo=EUR02-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3Fbu-009uSb-L4 for linux-arm-kernel@lists.infradead.org; Tue, 13 Jul 2021 10:25:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UbIT9zWX4fttyzNoPTf+ZHP5OapjmDaegm0t18vHIpi+7pqx7U4nzJ7foumX1FFQBKetQ/4wgbtWtn0ss0O5aeTPSTpDsT+VzrQvDdamO8piyVSUK7fofHRC4F7IsSdowvViIuRJD8H14EeoOqfuRRTwQ4+x4WYV0tAaXEqb3ZO+hXJfgrKEwdd5mQvJnblujXDC9+vPoqAVNav/CdLz6cCR2hnOWblSaMc2Pi6+TcbNxDBOLYBj5V6dY+LGh5rc6P46Ddt2UJGjIXZ4p6eyiTgnSSGuf9gMJ8fvmbEphPYXdn48gHv6yP03SQf1nIvPUZXrkpE79+WYrAMPUFKNVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ckDPSsFVzv3NWjjrNqcD68iD8bHaj5KBipoUq89jOm0=; b=LSxUMQSe3R1l+yFMw6sH6TD59pIVkjssnuUP4Sk2URKRUfKf71SW1UL98ad4DuqWG6UKJ7Nf0+r9IirX+wSDMWdTzunaqvcXl68hOGRKcV2mezHkX6AHjbUflbOK7gFaEYrv3S/5wmsfwBT+7KWP1a2ZoF9uitd9P2r/JrDYA1Ed4LyPjDrYGqiRbwTs/vQoVUszkhr86sG1P3R+06k3Ci000Hx80sOPbR4XpcGSNRC+5FwO7ZwOzYM0YRiP2vZ4hiPgklzdbITm5C0erXlbt8+j08dzjGzSDX6QbaB/ggy1mV83FRo3Xozp1bNa5L0qkXJURUfFBCt6C8v1T9QqxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ckDPSsFVzv3NWjjrNqcD68iD8bHaj5KBipoUq89jOm0=; b=dTA391NdtttNgWHjBsbqfyHffEqbSQGg1xCRsPJ+gQOjxTVgUK8M3gj1orrbZZHtFebFG4IKXiZZPXgC3gHlDymiqpafPyNO3eddgP14+2LGFJjHRg2v8EK+S6MONQTnKi/3WOpjCh6/EyknphvX0t/OGJ7GsDSeycslFmgHirs= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none;kernel.org; dmarc=none action=none header.from=nxp.com; Received: from VE1PR04MB6688.eurprd04.prod.outlook.com (2603:10a6:803:127::25) by VI1PR0401MB2288.eurprd04.prod.outlook.com (2603:10a6:800:28::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.25; Tue, 13 Jul 2021 10:25:51 +0000 Received: from VE1PR04MB6688.eurprd04.prod.outlook.com ([fe80::a978:6f38:2bce:9076]) by VE1PR04MB6688.eurprd04.prod.outlook.com ([fe80::a978:6f38:2bce:9076%5]) with mapi id 15.20.4308.027; Tue, 13 Jul 2021 10:25:51 +0000 From: Robin Gong To: vkoul@kernel.org, mark.rutland@arm.com, broonie@kernel.org, robh+dt@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, shawnguo@kernel.org, festevam@gmail.com, s.hauer@pengutronix.de, martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de, dan.j.williams@intel.com, matthias.schiffer@ew.tq-group.com, frieder.schrempf@kontron.de, m.felsch@pengutronix.de, l.stach@pengutronix.de, xiaoning.wang@nxp.com Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v15 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Date: Wed, 14 Jul 2021 02:41:41 +0800 Message-Id: <1626201709-19643-5-git-send-email-yibin.gong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1626201709-19643-1-git-send-email-yibin.gong@nxp.com> References: <1626201709-19643-1-git-send-email-yibin.gong@nxp.com> X-ClientProxiedBy: SG2PR06CA0198.apcprd06.prod.outlook.com (2603:1096:4:1::30) To VE1PR04MB6688.eurprd04.prod.outlook.com (2603:10a6:803:127::25) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from robin-OptiPlex-790.ap.freescale.net (119.31.174.66) by SG2PR06CA0198.apcprd06.prod.outlook.com (2603:1096:4:1::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.4308.20 via Frontend Transport; Tue, 13 Jul 2021 10:25:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c0387ef-e881-4164-ed83-08d945e8969b X-MS-TrafficTypeDiagnostic: VI1PR0401MB2288: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ez5Ef3PcwebbzjWH6MEjz8JzwouDTOjO7DxqfYgV6DuSncjSTbOHctjeiRjUCrwJ5pb6g4VDoWcjwyL64RUMycO3/MbaulnYnpZOKNly/HhVlDHZ+aUvQtpa5W9nF990kh3NC+ng3zMbY9n8JVlsEzZ/cV7gSsvb8AaEG8sahk7EVii6Jhx/aSu/hl9Q5IcUuHXAdtngJezgE4lnAp4JsbeGvMLwAA+7VgsV+cvMfGEcREEUIbsEQBdRaFVn1iNAoizJSPqvf59XQf/h1RguN9UP4a63GP43I/4VUi9SIGdAlWTWgMEei2s1wjrWVZifR1drl9tytLX+RC3WCUXrdXdO6CUDbbwAQLMy7ecK7TqaatvX6DrIJMGhPJ5ougLFDye5BF1qKDfsiQxKHhsZAaNegOumgdOpWT9cWn+qtiKZ9rIByKthZn2wyAmlf6q16rGrA7u+D9holgpsspy+eXtb99iG7DnSx3aFt7SWXWWsEAshCrXbv6t8ObP50FcBr4tMFFDbcLJSI8reE4x1krSw9tnvNIVsUKpYQlYk1xKluGmYu+hvooCoCoMR/SxLcZN1/9G2XkYimfcT0/VFYZtHbssth5OB8jWtvRe0wi42MbaGcKocm8XcAHH8NhPafTO8waeyiqTCdHNUxeRdnH1PGA0CiqBn9oam8gIXgQNXITkUyHmcLvrKYFXc18Zp+OZEIuZ7SFExTtjDj+O21Re1RW8/qgQ5Pe2NccIxHWQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6688.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(136003)(346002)(396003)(39840400004)(376002)(6666004)(6512007)(316002)(83380400001)(66476007)(38350700002)(52116002)(86362001)(6506007)(8936002)(5660300002)(921005)(8676002)(36756003)(66556008)(186003)(26005)(66946007)(38100700002)(2616005)(2906002)(6636002)(4326008)(478600001)(6486002)(7416002)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XzdLGHxl8pTxshZ3vTH8pbs4pqh4Ffhhkv3IFrYZHltFXWcrgYNmiJndiszrtiRpivC38pUWUPaZYrXnj+53FN7/ibFgXYXZHWXChxum5YpqDXuBDJbVvFxTrALPpwl2fDar7lbx9c5Y8FJnoltsiQrHcD7tjABAwEwTJXd9vWBMTfVtiRPA6yBHjCsLd8hv3cAPL0mQerSzOnZXEYoJltbSGyPwWnAPjXMYPkdMPe0zpt08iVumLltxmZxGgUviAyHNxd3ULwE+GWytq0AYY2IFscE1oZMi3Kal7q3V4AC2Q54t+qSopjxfQFSnEtCRmsbxhIhGjV4Ee4HCuovXrhBOjgEVVXNbvXTDOKi5sMMYIPevNMG9C+WTZSwXK4kHqGghjzpaR/c+F2WbDqeSwBFpoITnVEQmU9k6mC55sy52nVJmKGQrmAn8PKKEvd3DWLWtd47BjDIsV8M99S6VDr6NhAxdCJYscq1r3Ogj8nDt7xdVQhTPpjZH7/is6sWsAggSWBNEFY5ez4BDsS4MJGkl/EFIEV6z7yD/mlWULJ9/nQnM9J+OmAGA1MUQ1V+WNRuvl9uvUTKermQpjvu9bPcaNWQrcH+a1InJmw3phlXVrZCOJ2d6R+VNu0Lnj6AIZKvCuLWRp7siiOkyMCAqJYkYX5Fqw+B2621q4+zEyKe4tvyepxS9cHHEMVu+fdl3LabIOo8h4cQjLXcJKxofP8Tqw8UuorKmm2JQVkRyLxM7CJLJR2iBU8WH/3P7sJBYwTZjKJ4Zz1xVGekyErC79P19/u2Y54ETWsxkXzf3YxBnKNS9vd1nVbFBKeyBDyG/FR0DXDl+n+a7uTxbDXpkIZ97a7mnh4RT1y356/ediOquHo9TjrMGZYNfMDJRodDQacvbYJOpm2D4FHiGyBz4vpefdEkOyvelKJ0W1dI1OhKc6asy70PVnfgawIJhfabiwDaPqsCs/7ppHdHAxFoEkl/6ZtKOxLhhWylb8oReioPjt7IsOXReuKKhf0kKDVHki8ldLgsgzUKWsXnkZSxwNOwrZYqf4rcXX8JFv89CeY/YNkQOxAgpXrv6zXQXf9ijg+gBD4xIx3VJ4EwmM2+Km91for9xyvLZ8xb71u+3o4KxB37whHInlCHdalNt5Ba0JUJQdlrDBVwKIK8xwU2MSkZpCK0JZzZa+e3dd4yY5is4tOUOpTyK/gOD4zbmDzAWDtw0ANCrHQzg2A0A4CXj2KK4KydzHV5SadWCX9aLhoO2XQl5Xs33n8PX0YPQJaov2aevK5oukLkmjqYbNAo/zNOMDZiA9JdiprpA36VMACxzdD2KhSGCs4/vByKmrK58 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c0387ef-e881-4164-ed83-08d945e8969b X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6688.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2021 10:25:51.4204 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pHz4o1ERHJexjpu+avagBUAVQx9VCHNOiRWSk2jES6ej84Z3YY0VHjVHGktHFeyOKpEJcnAaQcJTWTDshnxW+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2288 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210713_032554_747273_1D8D51A0 X-CRM114-Status: GOOD ( 10.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since sdma_transfer_init() will do sdma_load_context before any sdma transfer, no need once more in sdma_config_channel(). Fixes: ad0d92d7ba6a ("dmaengine: imx-sdma: refine to load context only once") Cc: Signed-off-by: Robin Gong Acked-by: Vinod Koul Tested-by: Richard Leitner --- drivers/dma/imx-sdma.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index e510df0..665ccbf 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1161,7 +1161,6 @@ static void sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac) static int sdma_config_channel(struct dma_chan *chan) { struct sdma_channel *sdmac = to_sdma_chan(chan); - int ret; sdma_disable_channel(chan); @@ -1201,9 +1200,7 @@ static int sdma_config_channel(struct dma_chan *chan) sdmac->watermark_level = 0; /* FIXME: M3_BASE_ADDRESS */ } - ret = sdma_load_context(sdmac); - - return ret; + return 0; } static int sdma_set_channel_priority(struct sdma_channel *sdmac,