From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 0877F3DA7EE for ; Fri, 5 Jun 2026 22:02:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780696927; cv=none; b=cXGckei2vYtDWUhDFOKfysfEd3tK9FZ8hUNRaTDy4tdwa9dj0zHBzh+z1v9xKPpzmQLCSYbz1WFybSF/U9uhKATLWIs2tz7ixzBzq3KyQcA8UzXBY2SoY4PMs7fHITW91pOqge8AHvZgDrz5vHPpKpRBXhM0H5NRsBvGlmuwDKk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780696927; c=relaxed/simple; bh=D9O4y8MzWm3dICcvhBAR8c5YwW29hJVK/MboyWCLTFM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rNTorxe2SCMmuTsL2PDdtvlbsr+DSw4nS8oVoQThn17dKox8WgeSEQZJsNCM900QJw3db8+XCNY2gp+RumiANWyDb3OnxBXehi6jCzOysONGi2QLYPaac16AlIbG0N2zKsswwAEVbVWlQe/wK2sJMoUbfDvdaKLb4E8psi4OD8g= 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=TTGSIWrv; arc=none smtp.client-ip=209.85.210.173 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="TTGSIWrv" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-8423efad617so1359787b3a.0 for ; Fri, 05 Jun 2026 15:02:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780696925; x=1781301725; 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=0c+DTbgBfPPUhSPBSk+riIkjYOZTEz8XaKJeP18mVBg=; b=TTGSIWrvCHES/ma7UJoIpncBDI8YCvzFf7rxBMO0bhawTfUow/xtXn+30ik31x/9cB 96rnWh8kQYUJUXmzDh1kap2zIFDEZ0SLIRqEfwvX5W38Mnw3oCJPRYF82ZXyFv3g6GSz dcHiI8zZ1qKI572v2x5twza2M0vRnnAh6Wnhifgq+zx+f+RuS8xFWmQlc2+JgBOdg8m3 +G1uHC9CNNJupdPp8xt9IENmUQ4Nt0O0EM8I1rgb8brIgl9jK7o/HKhbr0J0mhWF0Wx8 tAiFDTTzjn/JpXh9p1oypsSZCPhg0spTvvkm82znUL+iH2B3sZxjq6gD/wbfknpEOErk kNjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780696925; x=1781301725; 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=0c+DTbgBfPPUhSPBSk+riIkjYOZTEz8XaKJeP18mVBg=; b=UD9nbPWBwwKga4mDlzfW7jp6IK59XhhPX3xLQWbxmiapMvSq1Rh3kOELCKXGpmWd6U LL+6HD8kTq28XiHPJyD8RxEi1TheD6rYOUgHov/ToIckxc3YNqknpPld/S0f6ZlYqgf7 qw/xm8sJk3D1nPazKDVqjX3e1Ab5spzu8wLVwHIcoM5Lkm/sIIUXCmIbR4c6StiEiyKA ImPET3LKvl5a4mFW0YYjdSILDZ1dOPXqBFdvczK6duh3U5LMl3GVGzv5aAU7RyJ1cPzv R3QuOsF8qn40Yz5qupbJhfxFFBdAztevIOUDdV6OKe1d9PxftJ0Mpvjo7RiRNOL1geCB jAkw== X-Forwarded-Encrypted: i=1; AFNElJ/JAfJ/lAwrNPrpihVFhrIB0lJcwhYLp3GEnbrf7+SKgYnCanw0CkmiyW3z8pEcTml1d+ki6tw73K+OcbY=@vger.kernel.org X-Gm-Message-State: AOJu0YyigTJhCCW//yzhRobi3o5L9FXiWV50CUZXC/f+lN/sF7/sPtpl 8zv13LBAxzL4mlATZbz/BNmK2OmA50X/0jS6HF2c+/W6WoR9I5SLXPt2 X-Gm-Gg: Acq92OFfUJK95IbkJcQ7vITPU9NnaSKhzqr/Lzi+pNhp6nKbe9xcYY/mFhl8YLUSNvS DH1zH5ftFrhmMLk62cCHUFNxRuVuUWewVS1akV/t4kA63ixC66oRjhuX8ffHeH8EDZ8sK0f/pM4 TwICU6ALP5g9ZLu052PXzFfPTQqm0LzeOOlVD6wRJ29AAPsHVOMwBA8/+Ps8kZ/Y28tETbOY60T b/MwliJ0Z1ezvFduOr00X39A7cpBcILPIAQ13Q8cEfxcY0VLfsYTzXLuxxUOAku9r+wen+EIHqV uhCrg6wv9WgWR7+xKAXzpyn/FrNwp0+3KUeI1fyaPQDVMhbCcTWYlVRoWg+kyJHR+Y5CLR8XrO+ MXkks49Qy6qSAdN4UREuDY4aXEYGJrSng5Q7l5t7QJNHY019JhZFXce2JFGT0bGYolgSXEHEmbV j9yghvJ5RJ0h73BM5cAz6EtIpuCBpPVLHv7krqr2sxQwlmG5gjDLFahlgh01YxTHzGPGF8QWWUV FsJ/h3nFMMEqzOOj9Ae9yxYsJtaiduQpXS8efydEzYh/A== X-Received: by 2002:a05:6a00:66c1:b0:842:6004:3fb9 with SMTP id d2e1a72fcca58-842b0f52ecemr4959351b3a.25.1780696925057; Fri, 05 Jun 2026 15:02:05 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-842824a1cb4sm12518883b3a.26.2026.06.05.15.02.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 15:02:04 -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: [PATCH 07/10] dmaengine: fsldma: convert channel ioremap to devm_of_iomap Date: Fri, 5 Jun 2026 15:01:31 -0700 Message-ID: <20260605220134.43295-8-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260605220134.43295-1-rosenp@gmail.com> References: <20260605220134.43295-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 Replace of_iomap with devm_of_iomap for per-channel register mappings. This eliminates the iounmap calls in both the probe error path and fsl_dma_chan_remove, and simplifies the error handling by returning directly on failure. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/dma/fsldma.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index ee6e595c2972..0d73ce3dbfe6 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -1108,7 +1108,6 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev, { struct fsldma_chan *chan; struct resource res; - int err; /* alloc channel */ chan = devm_kzalloc(fdev->dev, sizeof(*chan), GFP_KERNEL); @@ -1116,17 +1115,16 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev, return -ENOMEM; /* ioremap registers for use */ - chan->regs = of_iomap(node, 0); - if (!chan->regs) { + chan->regs = devm_of_iomap(fdev->dev, node, 0, NULL); + if (IS_ERR(chan->regs)) { dev_err(fdev->dev, "unable to ioremap registers\n"); - err = -ENOMEM; - goto out_free_chan; + return PTR_ERR(chan->regs); } - err = of_address_to_resource(node, 0, &res); + int err = of_address_to_resource(node, 0, &res); if (err) { dev_err(fdev->dev, "unable to find 'reg' property\n"); - goto out_iounmap_regs; + return err; } chan->feature = feature; @@ -1145,8 +1143,7 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev, ((res.start - 0x200) & 0xfff) >> 7; if (chan->id >= FSL_DMA_MAX_CHANS_PER_DEVICE) { dev_err(fdev->dev, "too many channels for device\n"); - err = -EINVAL; - goto out_iounmap_regs; + return -EINVAL; } fdev->chan[chan->id] = chan; @@ -1192,17 +1189,12 @@ static int fsl_dma_chan_probe(struct fsldma_device *fdev, chan->irq ? chan->irq : fdev->irq); return 0; - -out_iounmap_regs: - iounmap(chan->regs); - return err; } static void fsl_dma_chan_remove(struct fsldma_chan *chan) { tasklet_kill(&chan->tasklet); list_del(&chan->common.device_node); - iounmap(chan->regs); } static int fsldma_of_probe(struct platform_device *op) -- 2.54.0