From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA65133260B for ; Thu, 11 Jun 2026 03:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781150001; cv=none; b=Qu7Gp3miW5a/Za7UJ1IOy1GHeIRUP01pJVC+546Yl8Uxp4C+cKV3vGgifhT2gtZTenMZJGI/rmzZAlOq2HaxNsViJp0TFOnA+P0OQidfylH+4m+5fXrfbcxSH0HXPHnK7ItAXXOvbK3mKC8r5Cgs4qVptRkVeDqAp9oDvBw170s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781150001; c=relaxed/simple; bh=UT1C4wA3q9lIRCyJivjf61ODs1oCMhkNHxkHksrCzwM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nqQBO6bgIBQfMlPUYUvpKpSER23lEKzUvbUcuA6A9v3cmMLSjw3l2367E3SeviaTrb+JEeDGRNei/7194SlKRpcv6XWPdNTtiFJj7qHannz7UbBBxL9PLucgCdcNERDXYWqETQql+R/9wRZotmducrhtpr5zMIj2MIKAj/mXR0c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=S39/sjfF; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S39/sjfF" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-36b9b15af73so6885937a91.0 for ; Wed, 10 Jun 2026 20:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781149998; x=1781754798; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/RqUuykkdPZkLeqRZi/NqGaxU3+Ffx6rHHdgS1c9JQc=; b=S39/sjfFv81RbxlPZiHvhvyEWeXL37K1bkrooNmuqHQLKJos92lJOxM5BGbDmg6lPy csYeTAuz2ltIuAKQVS+06Xl3SUvIZYdMChhrn0j4mgpwuOLJOhrfd6j79F2JY4os7lgl v22/VGTsIZhUJ/Nk04iehwijyHzUIlAGokCgY5Lrmb2qzVeLzCyuJJd4gvpZuw69IK2H FcfbEbM8CtXgS5GAPfnY3F2+R6jb/nXpeh+b05KNF0x/+m/Qej10tlIyoRn1fjXgmM0S WJVbI1L0iCHaGB6JSIgKAiPKNhi0te9q/tw9RT6GNt+XVLjJCVqvjMw4E/QDy20X3YRH c7RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781149998; x=1781754798; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=/RqUuykkdPZkLeqRZi/NqGaxU3+Ffx6rHHdgS1c9JQc=; b=RVn6dwWM8XAu52v7QARO6n0wBMOyz2Jy6beUFLj33iNXsiQ3/vI2Q7kr7+KzSwq4vq JWdmz2CEeeFjRZh90O/nYhk0H4KoBHzVHkVt765L2DV3ewTNYqTLbYFqh92A77YQc4KP TT4mXj5ttGetoMoMCDGs9eMtKRVIrhsBhiOQk5mp9O/kJKI8BUFoBPrrGGBbGXCrQET1 QNTuG/xB5NGUQaPhnv5cVl4N3krrd4kV4vmBFr0dsHxzduAvXNLavGG0ZwpUDF7vBsek 9KMyrB94LU+d9OTVl6nRRJt5yLL43yfl9Ix2ZuWqMSSiASRxdDivIBnSdcHu2k/kz5aW 3iyQ== X-Forwarded-Encrypted: i=1; AFNElJ9cvs5SNneSlRvIuR1lxzPIvyy6e+QwXWnnUIoXj8PpLN8HYvAafG/H5pqVmLAEvo3X2RoURRuT/G2B7Dw=@vger.kernel.org X-Gm-Message-State: AOJu0YwWYX+c5e8yZv0rtOyxKyQ8vd/GT0SIvIpy2F85veHlVQobET5y T+TcsgJJCMgXDv0WnqTVSK1pekIjWG0UVwBiu6kg8rEbvPoC4XUQ898RM+lqsA== X-Gm-Gg: Acq92OFpRMstmMW8rXeKhH+1AxRXOLQaDtJpjo9JK1aq0IPLFyKyVZgiqZYtlDvy0D0 jVCjIHJ6BVzlMHRkm94fvzVXUg5RsOP2Q8wnGxt/WcR+xlXUA1eJnV6l8r0yU+B9UglLUvTOd1b PVDiWxtyRsBcgW/2+xTfTxfuZqG83fgpiMK2Nvk5Yyd5o8jasu0ee36rN3GU+HnleLnb7K7pY89 LtrqQhsNVHh7FuDacORr/qZvQNcuIFJB+e0RQtpb8WPALgC16GQ1i3uqvZFM8s4zyERo9Yj7ziv scQDpC3mH/oDjTDyUPtEhFr86C+aUqV9mVuAlhYco59tzRkAW2GyDOw5EPkZV0ylqk25SwaOZIk 72MlXvZHucsNgBWQNoQLv09HQLNuJA8zcFMRe8h8M6njMUZsRgQltV3VjKW4ws+oruuV/tNh8Q1 47owyKAvc041RRlXmUvL946a0GzkTuHKR6n0aelRT8Rw0fxiMSaODTOBg1HYTnGE2EzUtswbWaa iZC9PXQKGnvD8A51bzSuvSaC7avDtoAI/IWBK21Snr3kw== X-Received: by 2002:a17:90b:3a05:b0:36d:b12f:613c with SMTP id 98e67ed59e1d1-3779f186dcfmr1274210a91.10.1781149997909; Wed, 10 Jun 2026 20:53:17 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-377522a188asm910131a91.3.2026.06.10.20.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2026 20:53:17 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Vinod Koul , Frank Li , Zhang Wei , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-kernel@vger.kernel.org (open list), linuxppc-dev@lists.ozlabs.org (open list:FREESCALE DMA DRIVER), llvm@lists.linux.dev (open list:CLANG/LLVM BUILD SUPPORT:Keyword:\b(?i:clang|llvm)\b) Subject: [PATCHv4 10/15] dmaengine: fsldma: use devm_platform_ioremap_resource() Date: Wed, 10 Jun 2026 20:52:40 -0700 Message-ID: <20260611035245.13439-11-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260611035245.13439-1-rosenp@gmail.com> References: <20260611035245.13439-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert of_iomap() to devm_platform_ioremap_resource() to let the devm framework handle unmapping. This allows removing the out_iounmap label and the explicit iounmap() in both the probe error path and the remove function. The DGSR (fdev->regs) and per-channel registers (chan->regs) map physically distinct regions in all supported variants (EloPlus/Elo/Elo3), so there is no overlap risk. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/dma/fsldma.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index c3d2b24f8f07..e4a3315a7d9d 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -1238,17 +1238,15 @@ static int fsldma_of_probe(struct platform_device *op) fdev->addr_bits = (long)device_get_match_data(fdev->dev); /* ioremap the registers for use */ - fdev->regs = of_iomap(op->dev.of_node, 0); - if (!fdev->regs) - return dev_err_probe(&op->dev, -ENOMEM, "unable to ioremap registers\n"); + fdev->regs = devm_platform_ioremap_resource(op, 0); + if (IS_ERR(fdev->regs)) + return PTR_ERR(fdev->regs); /* map the channel IRQ if it exists, but don't hookup the handler yet */ fdev->irq = platform_get_irq_optional(op, 0); if (fdev->irq < 0) { - if (fdev->irq != -ENXIO) { - err = fdev->irq; - goto out_iounmap; - } + if (fdev->irq != -ENXIO) + return fdev->irq; fdev->irq = 0; } @@ -1319,8 +1317,6 @@ static int fsldma_of_probe(struct platform_device *op) if (fdev->chan[i]) fsl_dma_chan_remove(fdev->chan[i]); } -out_iounmap: - iounmap(fdev->regs); return err; } @@ -1352,8 +1348,6 @@ static void fsldma_of_remove(struct platform_device *op) if (chans[i]) fsl_dma_chan_remove(chans[i]); } - - iounmap(fdev->regs); } #ifdef CONFIG_PM -- 2.54.0