From nobody Sun Feb 8 22:18:28 2026 Received: from fw2.prolan.hu (fw2.prolan.hu [193.68.50.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9261A288519; Thu, 15 May 2025 08:31:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.68.50.107 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747297905; cv=none; b=Ss1itlNOuJIVsapmJpGdWGgYylp0izW/WDKQWR80DSexwiiPUajlD0X/Yas6yNy4N3nF81V/1yAo0pzeaVtwc+MXy7HCkwmteuDyEzLrjt20dOCOwg4YrYqcXPRnICGXVinqXS0gOJgILRQSSR3cwPhCcD4k0F2ECmYPs2Rlro0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747297905; c=relaxed/simple; bh=RZYIPXpDN8oj5s1t15Isb+e1NRle6tqtT7usLRhl1MM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qALVBLqj1mut+Of9SPW1pgTWFis6G9hl4FH3jDuv05o9JjkcyqmuFitS37rQPK7JuL38DbOfGIAnO4mSHIwvpFJJ7Ki661UtyKM66DYdKOrB99lVbKlN/sKm+9+vsLfHHkLQ6t5fli0UBojr5IBdmoIKkDL6m9HDeR04wYgAljM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu; spf=pass smtp.mailfrom=prolan.hu; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b=Ou8e9/td; arc=none smtp.client-ip=193.68.50.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=prolan.hu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b="Ou8e9/td" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id D1672A066B; Thu, 15 May 2025 10:31:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=Pdrk+9maRsee0qVYskeN GJ6hDw5zw0BT5yTDbtuUL8o=; b=Ou8e9/tdpwv/ky4sJqkdizpTc86Vbsy41D7k 7dtyy5NbG6EGVlRPaHJJUwP65Fl7Cpkt9UyX2mKuA8YyI+eVyy/yCY8Q2yE8P+2r CpWG+gzlqS5h5PlYzlfsy+wnAS4uYXg0XU4kwk9GQdPCodKF5Cgtct6Q+QHiTv4h 80vcQFjCwA2ICbc4yb++mNjbouEi3dujYLTsFN+dAzySNbQ/gk0Dd4j+roaIsuX5 bvcpoZbeSpY1CWJ2n7/UUfndhON9j74py+fKqG5A3JHI90uOc/PlrZasUE+qKUt+ 9ZRFFGDMEV4Ikh4BtkxfZt1EEBJ0vx2HNcFV98vtGKlFiR6NRL6PH9Qr3A2A2pOr pkAUMqwsZrtg+r2KqB916/ix21PWzRLOcvcwPna/bgVKTx2/lnqrg5KTeWkWZr/G 5+dvNLg/NxKABi9ucv6SulsI6ad/oSMCRcR5iJP4lRfjwjqnEVXPda/h2mcd/Hey Apr+VijNHbtVbBRtoLgMy0il4sUMVeazzjIcNDeje4wDzlrcv3iSpDlzoupVJAnb Ro2u9f9AtB64ZgC9COZSim1NwmpViJPTasGap7gpZxSwJG6XaPN6gNASVrN+ccDQ qGznIU2z+go78l01LtrIUtYjlf+r0I8h89c7ASmj0VAhifLu2mgChxGvWCIRG8UA i6zyeTA= From: =?UTF-8?q?Bence=20Cs=C3=B3k=C3=A1s?= To: , CC: =?UTF-8?q?Bence=20Cs=C3=B3k=C3=A1s?= , Vinod Koul Subject: [PATCH v6 1/2] dma: Add devm_dma_request_chan() Date: Thu, 15 May 2025 10:31:29 +0200 Message-ID: <20250515083132.255410-2-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515083132.255410-1-csokas.bence@prolan.hu> References: <20250515083132.255410-1-csokas.bence@prolan.hu> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1747297898;VERSION=7990;MC=3872013306;ID=2670053223;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A29BB64155D617062 Expand the arsenal of devm functions for DMA devices, this time for requesting channels. Signed-off-by: Bence Cs=C3=B3k=C3=A1s --- drivers/dma/dmaengine.c | 30 ++++++++++++++++++++++++++++++ include/linux/dmaengine.h | 7 +++++++ 2 files changed, 37 insertions(+) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 758fcd0546d8..ca13cd39330b 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -926,6 +926,36 @@ void dma_release_channel(struct dma_chan *chan) } EXPORT_SYMBOL_GPL(dma_release_channel); =20 +static void dmaenginem_release_channel(void *chan) +{ + dma_release_channel(chan); +} + +/** + * devm_dma_request_chan - try to allocate an exclusive slave channel + * @dev: pointer to client device structure + * @name: slave channel name + * + * Returns pointer to appropriate DMA channel on success or an error point= er. + * + * The operation is managed and will be undone on driver detach. + */ + +struct dma_chan *devm_dma_request_chan(struct device *dev, const char *nam= e) +{ + struct dma_chan *chan =3D dma_request_chan(dev, name); + int ret =3D 0; + + if (!IS_ERR(chan)) + ret =3D devm_add_action_or_reset(dev, dmaenginem_release_channel, chan); + + if (ret) + return ERR_PTR(ret); + + return chan; +} +EXPORT_SYMBOL_GPL(devm_dma_request_chan); + /** * dmaengine_get - register interest in dma_channels */ diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index bb146c5ac3e4..6de7c05d6bd8 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1524,6 +1524,7 @@ struct dma_chan *__dma_request_channel(const dma_cap_= mask_t *mask, =20 struct dma_chan *dma_request_chan(struct device *dev, const char *name); struct dma_chan *dma_request_chan_by_mask(const dma_cap_mask_t *mask); +struct dma_chan *devm_dma_request_chan(struct device *dev, const char *nam= e); =20 void dma_release_channel(struct dma_chan *chan); int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_caps *caps); @@ -1560,6 +1561,12 @@ static inline struct dma_chan *dma_request_chan_by_m= ask( { return ERR_PTR(-ENODEV); } + +static inline struct dma_chan *devm_dma_request_chan(struct device *dev, c= onst char *name) +{ + return ERR_PTR(-ENODEV); +} + static inline void dma_release_channel(struct dma_chan *chan) { } --=20 2.43.0 From nobody Sun Feb 8 22:18:28 2026 Received: from fw2.prolan.hu (fw2.prolan.hu [193.68.50.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92684288522; Thu, 15 May 2025 08:31:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.68.50.107 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747297903; cv=none; b=X0YX+gDEdOwUvPXvaAR+TjFIA005fAku74AykPfP1qyLa79UELLdkHsY3Av0nxJhu5v9X6GgcQgGZqvLEaCfaqAv/wpi0Wc53K+UFLOU894/qecqw3YL35BWqOnAUT1XP6i+CLaRPxWUjtyxTwLy9kFhlR6oI09563JAErJ1kRI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747297903; c=relaxed/simple; bh=teRKCpcCZjRrySHJh7DujU1cBHibTtbcNpxnYm/ruiU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AHgiAltPM0RvM+QC/KjxEUiCc+TnzbFOSGCiAlVxkfX1oKTuY0EqbsZWAOr+Vtv6TbtCVxg3/ynLrA01qCrVNC1Barvo4h6Z03p0mBVSbj4N9OdoJmy1LS4QnrnZo/bFu/V6wTHu27InBaENfe3E2qFl3R8THdVAPfA+IyxboP8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu; spf=pass smtp.mailfrom=prolan.hu; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b=dWsLvURQ; arc=none smtp.client-ip=193.68.50.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=prolan.hu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=prolan.hu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=prolan.hu header.i=@prolan.hu header.b="dWsLvURQ" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id A7ED8A0780; Thu, 15 May 2025 10:31:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prolan.hu; h=cc :cc:content-transfer-encoding:content-type:content-type:date :from:from:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=mail; bh=h4hvPkDpasDOqzvoPlQR 6fqCNAD2mH8pnt4CYS2HbjE=; b=dWsLvURQpoDW2UvfwTuTTPHei2Hr7aJjcOzc ENp2TBHvHS40f44EPaWQw+GbWeHXqq9AvEAddTkhZg752jEOuKdyq50BqWG8Cpyn c1x/u8XdHXL+MbYUoquXuyWKT+AWOXEshStedJns8SpqDNRIFWnfwvGv4gbZaQh7 iFZwJDGEht0WdfgdfGkfhlWm55RgrU5aNjOV6oRlIr8DE6b9mtMsaKi9DvssFXyo tmUt5DggMCwI9roz7UlIeI2qKJ14hL5ieIkCe/dU6NlQV2bDi0bf9JJHsFQL5Ih0 pAj0J1fN0fY+PKq4qlIy1dYBHTe8sqs9JJrhm7ktRrxm8y+Ew9rW7Qg735+JaGD0 CHpdjSbPYwERDEyvW1ntlPdOvxV/4xp4OJGVd1gyY2tpDiHZkIjY0bRnDH9lAuOm 67ofeW83oz1S2MTn3Fegzf8U6kjYzPL3dsI9hXDJ+xb4/85nDiEuL8FYtEW73ajB eYiJnYPrdno32oCnP70+0Iv2uyESSaNDC6cSNnjJin2BSa7WvUvGGJiT1WGeXfV3 D91se+SqAd2hwdYNdVMB+AngwPCfnC9q6Ak97nN9A2Xh6AIOtbDphS3PD2C2eZrX zDQTsTWIy9I5xvwErbgdupsFCQv5A/JTUqUApVVAOhGFPKbP0180mtAQyJYYCStS +U/mKzw= From: =?UTF-8?q?Bence=20Cs=C3=B3k=C3=A1s?= To: , , CC: =?UTF-8?q?Bence=20Cs=C3=B3k=C3=A1s?= , Mark Brown , Nicolas Ferre , "Alexandre Belloni" , Claudiu Beznea Subject: [PATCH v6 2/2] spi: atmel-quadspi: Use `devm_dma_request_chan()` Date: Thu, 15 May 2025 10:31:30 +0200 Message-ID: <20250515083132.255410-3-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250515083132.255410-1-csokas.bence@prolan.hu> References: <20250515083132.255410-1-csokas.bence@prolan.hu> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ESET-AS: R=OK;S=0;OP=CALC;TIME=1747297898;VERSION=7990;MC=264603594;ID=2670053224;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A29BB64155D617062 Leave releasing of DMA channels up to the devm facilities. This way we can eliminate the rest of the "goto ladder". Signed-off-by: Bence Cs=C3=B3k=C3=A1s --- drivers/spi/atmel-quadspi.c | 48 ++++++++++--------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index 2f6797324227..fc555c0ce52e 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -1285,18 +1285,21 @@ static int atmel_qspi_dma_init(struct spi_controlle= r *ctrl) struct atmel_qspi *aq =3D spi_controller_get_devdata(ctrl); int ret; =20 - aq->rx_chan =3D dma_request_chan(&aq->pdev->dev, "rx"); + aq->rx_chan =3D devm_dma_request_chan(&aq->pdev->dev, "rx"); if (IS_ERR(aq->rx_chan)) { ret =3D dev_err_probe(&aq->pdev->dev, PTR_ERR(aq->rx_chan), "RX DMA channel is not available\n"); - goto null_rx_chan; + aq->rx_chan =3D NULL; + return ret; } =20 - aq->tx_chan =3D dma_request_chan(&aq->pdev->dev, "tx"); + aq->tx_chan =3D devm_dma_request_chan(&aq->pdev->dev, "tx"); if (IS_ERR(aq->tx_chan)) { ret =3D dev_err_probe(&aq->pdev->dev, PTR_ERR(aq->tx_chan), "TX DMA channel is not available\n"); - goto release_rx_chan; + aq->rx_chan =3D NULL; + aq->tx_chan =3D NULL; + return ret; } =20 ctrl->dma_rx =3D aq->rx_chan; @@ -1307,21 +1310,6 @@ static int atmel_qspi_dma_init(struct spi_controller= *ctrl) dma_chan_name(aq->tx_chan), dma_chan_name(aq->rx_chan)); =20 return 0; - -release_rx_chan: - dma_release_channel(aq->rx_chan); - aq->tx_chan =3D NULL; -null_rx_chan: - aq->rx_chan =3D NULL; - return ret; -} - -static void atmel_qspi_dma_release(struct atmel_qspi *aq) -{ - if (aq->rx_chan) - dma_release_channel(aq->rx_chan); - if (aq->tx_chan) - dma_release_channel(aq->tx_chan); } =20 static const struct atmel_qspi_ops atmel_qspi_ops =3D { @@ -1426,14 +1414,13 @@ static int atmel_qspi_probe(struct platform_device = *pdev) =20 /* Request the IRQ */ irq =3D platform_get_irq(pdev, 0); - if (irq < 0) { - err =3D irq; - goto dma_release; - } + if (irq < 0) + return irq; + err =3D devm_request_irq(&pdev->dev, irq, atmel_qspi_interrupt, 0, dev_name(&pdev->dev), aq); if (err) - goto dma_release; + return err; =20 pm_runtime_set_autosuspend_delay(&pdev->dev, 500); pm_runtime_use_autosuspend(&pdev->dev); @@ -1442,22 +1429,16 @@ static int atmel_qspi_probe(struct platform_device = *pdev) =20 err =3D atmel_qspi_init(aq); if (err) - goto dma_release; + return err; =20 err =3D spi_register_controller(ctrl); if (err) - goto dma_release; + return err; =20 pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev); =20 return 0; - -dma_release: - if (aq->caps->has_dma) - atmel_qspi_dma_release(aq); - - return err; } =20 static int atmel_qspi_sama7g5_suspend(struct atmel_qspi *aq) @@ -1507,9 +1488,6 @@ static void atmel_qspi_remove(struct platform_device = *pdev) =20 ret =3D pm_runtime_get_sync(&pdev->dev); if (ret >=3D 0) { - if (aq->caps->has_dma) - atmel_qspi_dma_release(aq); - if (aq->caps->has_gclk) { ret =3D atmel_qspi_sama7g5_suspend(aq); if (ret) --=20 2.43.0