From patchwork Mon May 29 20:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13258931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53FA7C7EE2C for ; Mon, 29 May 2023 20:06:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229866AbjE2UGq (ORCPT ); Mon, 29 May 2023 16:06:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229863AbjE2UGo (ORCPT ); Mon, 29 May 2023 16:06:44 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on2044.outbound.protection.outlook.com [40.107.13.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7091C194; Mon, 29 May 2023 13:06:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C8/CfK1zFSmXcjvebzp8huA5uWkgFYlnSm068AgFkfuCBBcKEgdbqew4dNWI1wehuxc3er6O4FjbJhvYb451kdbu35mC2Q0MjioLLUT2DIIn55DAFMlb7DzzsnlHfPiyJViX+cmLu8+UrpSjPXi5tF2qsHfrYJE3bVpX1tfM7kDN0f4+DIET+QpUBAYecWuQIkQZboTHdtLCOkNC0x99FGDWrcC0AbjfAgKf6kdotYwLb2MHgR01ED20xEnX8RAj6pkimuN6BGCoSTLCWmv6Q7lNpfRPodUcLUGbQcPq4KPvB+FFEjOFwN5jZzVeivvUEjfJT+JnfbIT2e34/l5Cww== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=v3P8AoOS+eHwcaqc5bUfUnf+Uxj1PFHD3YCKbldbyag=; b=nzBxkq0QuYJpuGs4q9xF2pMahv67UiFxY2pCvDX2wmzVK8B45kCdFwP5NIn0+qCufs9mjC2Dloi+pUQOYM7KNCBH/PJgNLvqcZK/+SzHU4hlkhuSOsDNLBYaordjV06cxgRZxAXV01vRnXqHnpaP0vBGanH+naf9qIchPY85gmE0xGilAACldoUUvWK8acBZ9iibmDsoLpxguFlhiDoBhnFJebqIHMZaMgloHXcKxGhubxAmUrwALI1r+nN5e8zupSaKG6IQRLYqFKVlBA5APZs7A1VzA+N7UUXuD/3radamCumCUwLg02n1T7fiFVjipOpvr1sYqUmZNphtol7W4Q== 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=v3P8AoOS+eHwcaqc5bUfUnf+Uxj1PFHD3YCKbldbyag=; b=oYFWP/zOE46/oqwrFinGnUjKJuRC3w4ZsVA+uHfJYO75g5WW0QPZ6ZRkQF+cAStfp41fTFSFyGNjVvKvGxjb0LqNFQW2Y7ec8/i5rG5LVNO4OmPcdDoyipvkKo3H6wAFHZHPfqliKfaRqRurgMojerSS4zWYgGfYUOB5obNjFCk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) by DB9PR04MB9820.eurprd04.prod.outlook.com (2603:10a6:10:4c3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Mon, 29 May 2023 20:05:33 +0000 Received: from AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c]) by AM6PR04MB4838.eurprd04.prod.outlook.com ([fe80::4a2a:262e:415f:e41c%7]) with mapi id 15.20.6433.022; Mon, 29 May 2023 20:05:33 +0000 From: Frank Li To: frank.li@nxp.com, krzysztof.kozlowski+dt@linaro.org, peng.fan@nxp.com, vkoul@kernel.org Cc: devicetree@vger.kernel.org, dmaengine@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, shenwei.wang@nxp.com Subject: [PATCH v2 07/12] dmaengine: fsl-edma: refactor using devm_clk_get_enabled Date: Mon, 29 May 2023 16:04:48 -0400 Message-Id: <20230529200453.1423796-8-Frank.Li@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529200453.1423796-1-Frank.Li@nxp.com> References: <20230529200453.1423796-1-Frank.Li@nxp.com> X-ClientProxiedBy: SJ0PR03CA0161.namprd03.prod.outlook.com (2603:10b6:a03:338::16) To AM6PR04MB4838.eurprd04.prod.outlook.com (2603:10a6:20b:4::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB4838:EE_|DB9PR04MB9820:EE_ X-MS-Office365-Filtering-Correlation-Id: ca88c6b1-5c4b-43b0-5967-08db60800f18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VB5PyEqHo6hbz04RIqO70xPUt4TmgAJKz9tU20i8pI/XGCzUgxbMFunplcx32+HO1AChZMTLtmtFqN/0umNly7Eqsx9DaPYSYE0lOt7aAjO9ic+VxVLs05xCunxRIIR2XWJ1UM8pJA6NDc65wkIigOgRk76cDvXF9AE6KvvaVbva1ov0+lMS94tkZuj/2xn5vlIo9HIE84CyJ2vAXXz8JYbSMWRBsyZ8ExIEhbABaomYjVBAN9xgLRL0NjsN17TZHF9DSH+PiwcBitrmr/noH2kS4Hk1n7lRFT0COu5XxpHXtbLczATcnDHRvQT+/YPsxir+gH7e4zXlBuWUMU0/RJDBlQlKsQt3vEZSKmeCDBHWZ90iIkuHsGycBObTKib52Csi/5tTQPIXDjeWzfFGg2UJIhFgApUBwIgqNrl9fyK0cblbgWjWxiF++Vo58+8JNUEXLN13YAnt6ZQXzsjpQ+Bj/HLX3FNWOn936RW4epkr9afnn/P11pVNJ2pF1Q0R7HFVktzjdGjJNLIIXbPEk72tKlL1kFwV2qrukNQEqr5LKqLQLzjaQqOKNNYz9eIx83o73QP6saJ8/X8EuP0DeyvWdDB0AvvCqtqO90fULn9nUuhL8YTOgznb3kt/ImkH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB4838.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(451199021)(83380400001)(52116002)(6666004)(5660300002)(66946007)(316002)(36756003)(66476007)(66556008)(4326008)(8676002)(38100700002)(41300700001)(6486002)(38350700002)(8936002)(86362001)(2906002)(2616005)(6512007)(6506007)(186003)(478600001)(26005)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kpRt+N40Lu4eb5ug+2y6+hByG/SesFBR9vL7Ba59B3YGDxchez8H9rzSE9HNP2O2TYmig3SGOE+A2FLuuCpCbun55XvQ8ucbu1JLNpurKTBqhjXlHSSFkdafmRHavprsSWbihwwr9cBpIrnwxmtTOMsvWdmfB9QiOkMmalo1kby8NuraoRtTyTmxGaddAWYHYtfjY5HuET9lFxrv8wMmfI0vsjCbTu1eez/wmalxG31GMRQgCth+LbeXg3w12jP0Z5C3USmXYFjCvmCdW6bp7y2c5h7D67Ec+LWj1a28s6ORMMJd1yHDQWMUdyiOvJALcB6oyNjbvDXC8RyhUmh6DfB08ZQLOfeSuBglo5FxCrusL7LiSMpekSCsR/nMv8FFApRgeHAiqBmVgar+CG5StlhumlAa7M1AIMbnQNRKQQqJAf9hODtCXXMvDNMZrChvbUfrQDYEwIlRkk5PDzqgriXmli5n+QGdtz1+9BxQBx46GcRn833yT/Ozg5FMdpTzLv9UwYsL0GeagwB7L957J7Ievqf/75xGY7dHkr4jmRmiWqS+Yg+7wLSfeTsbQTH/5O2B7CBEvzcew08I8/UhILOagm6fezpH/juPijYBkU7bYHIXjZHOz5ONrAzJCSLw8TTOYQn3tjLAq4aoKBlMy/3UaKOyYn+ugwsBbXjBCsNjL8XMrfC5oR1Tt6/wmC5d36SNX29ZDTMPnhKZjEoCGW6H0R3A3g729LcR4uvGmCKbWKlCw6eJrdbHLm57Fm88szNAXmTWyhfrca2F3gyTlYiLI6pezod4x3REpRkoQ5vp7u9R0bnPHniUvmOXyncKb5mVxVGskV1k98aE6T5jzKTLTHwFEErt86NCEHD0ZDTeIh1/FeuU+QJxeJWioICNoUccV9KXeNbqGia/d8OZ7bSb/psBIGEz1DyQHgYMPlS17k4Anq4jZ+flCRBKEcj8LGHwb6cn1nvbnyQBqKXqkFyKb+aXYFF6hDTIjVsPz9uvh9/erQWo7FYa9jXgPGqQyMDTXvkByr4d2fMaz2h3YQxP1yjXv3JW7yaFDOAyY/YVHvr9Z/bBWyiGLwMRcNq/vWSM/B2rrrtJpqKHBTYeW8WLtR8OpSpmmwHEgnA1iSlDUPE1SgnFN8ggvNM51hI9BNxezNTtYPlx+SAtGzc/M1bGr19GvRjbS7puIIqR28TsGf+voR+P9bvWdRFlW6irkdYpqRAHfq9RgU5FOr7vxKro1FpWw5/Dpjxu6LDl92Z99FPiVQ7xPZIi/JSycHoIsSOWFMKFP00uXiWArxv0o+sBcRcij0vK/5kshTTe/rd5Uft+so6RkwwXB0EfAimGpf40/CSGRIpWeDbTqlBZ/SwVOSY1g6yLn3Y0r1CSxmwwXDrYOTxo9ct/te3j51JArGykZysBtThWgDSAdoA8MaLM4hbrieYD9LsywSoEkcvZ4sn6bMlXRkmwXYvx7lfHlPgd9FrAWsteafeKGwbGdaHQMnssKxDY8KVU6y4v3pO0mW3BzKmKP7iC9QOrYWfVei88fNN2nJhDikjoVROLxmhKcfnkJqBxbGgv866IBKxYLFXPXLB+Z8disPP26UR2 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca88c6b1-5c4b-43b0-5967-08db60800f18 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB4838.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 20:05:33.0074 (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: hZDsbsP7Xtuah7duJIClH4NLLaZHsW7+oQwCZBcJecw0WtxrpFVMU28n6ivLp/RGRADURxyWLZaQkrXFU8i00g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9820 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Use devm_clk_get_enabled in probe code to reduce error checks, thereby enhancing readability Signed-off-by: Frank Li --- drivers/dma/fsl-edma-main.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c index 9c0b6fb4cb8f..6126717fc87e 100644 --- a/drivers/dma/fsl-edma-main.c +++ b/drivers/dma/fsl-edma-main.c @@ -268,17 +268,11 @@ static int fsl_edma_probe(struct platform_device *pdev) regs = &fsl_edma->regs; if (drvdata->flags & FSL_EDMA_DRV_HAS_DMACLK) { - fsl_edma->dmaclk = devm_clk_get(&pdev->dev, "dma"); + fsl_edma->dmaclk = devm_clk_get_enabled(&pdev->dev, "dma"); if (IS_ERR(fsl_edma->dmaclk)) { dev_err(&pdev->dev, "Missing DMA block clock.\n"); return PTR_ERR(fsl_edma->dmaclk); } - - ret = clk_prepare_enable(fsl_edma->dmaclk); - if (ret) { - dev_err(&pdev->dev, "DMA clk block failed.\n"); - return ret; - } } for (i = 0; i < fsl_edma->drvdata->dmamuxs; i++) { @@ -293,19 +287,12 @@ static int fsl_edma_probe(struct platform_device *pdev) } sprintf(clkname, "dmamux%d", i); - fsl_edma->muxclk[i] = devm_clk_get(&pdev->dev, clkname); + fsl_edma->muxclk[i] = devm_clk_get_enabled(&pdev->dev, clkname); if (IS_ERR(fsl_edma->muxclk[i])) { dev_err(&pdev->dev, "Missing DMAMUX block clock.\n"); /* on error: disable all previously enabled clks */ - fsl_disable_clocks(fsl_edma, i); return PTR_ERR(fsl_edma->muxclk[i]); } - - ret = clk_prepare_enable(fsl_edma->muxclk[i]); - if (ret) - /* on error: disable all previously enabled clks */ - fsl_disable_clocks(fsl_edma, i); - } fsl_edma->big_endian = of_property_read_bool(np, "big-endian"); @@ -366,7 +353,6 @@ static int fsl_edma_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Can't register Freescale eDMA engine. (%d)\n", ret); - fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs); return ret; } @@ -375,7 +361,6 @@ static int fsl_edma_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Can't register Freescale eDMA of_dma. (%d)\n", ret); dma_async_device_unregister(&fsl_edma->dma_dev); - fsl_disable_clocks(fsl_edma, fsl_edma->drvdata->dmamuxs); return ret; }