From nobody Mon Feb 9 02:23:15 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 1371B280001; Tue, 10 Jun 2025 08:23:01 +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=1749543783; cv=none; b=irulSgZaHDkHYneKIydCdt9EyIKLnZqHMhxsMKi3OEEYqgqMWgkUaXzdrXP/CTeEs3TjTPhznOPro2z9jtlalRYUIzbjg0JbxrEC0+CC3vUKCfU3oq/tC9NegGH/KTmMswzOJZoLmO3tEA6U0cvF6dglSCzgXwEQD2QJ5J4xJNw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749543783; c=relaxed/simple; bh=RZYIPXpDN8oj5s1t15Isb+e1NRle6tqtT7usLRhl1MM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oOLEhm51/6PY+kHhm35uzRlfmp3WOidCXG0o8x/A2DD31/iT9a9FRc1Z1jbgd8gAf7amgz14N7cQNY6Q4gBMwSTqZ9/Tyxv7uqUtF2aoBpRcSBQoNR4unNFprEB/2yKLuNCbk/APesX5d7ItJMpW37y58jbRZHMEKf5v7UuJa1Q= 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=KqYL8leP; 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="KqYL8leP" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 13436A0403; Tue, 10 Jun 2025 10:23:00 +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=KqYL8lePuGKIAp2vckOl5PFO/lSuKWly+jUp iMCbuVBeW6yv+fGXONBocsQUNm30RuM+pFwi2DXY+W6+UmcmltQUYsm4h2704ETe P4tcMzFjJExDKEMagaEaFgc9q3EBHuqfB0HYQF085t2XzKNpDjSWad0Ge3dUFxvd bVenmrx2KoPNoVmgt2TmdtOOA99W8jnDU3+TnvShl2V95MAQELlABhxa/j/kFxLu OOdNdGuTvtjWT3UTTB2/s+00clIMlevN/RXIL63/2Oh7jaJM88YrBMqVXgurvEal pxtUlQfyoN9Ex74plaJ4b3nrMM8jtKl6lH68esWnmH/WKONThLbNg8kmBupXuVve pweIGNUxAaRGhw3dV6qga3Q3dVteSHLykiMCSKvd3r6f6e8YE+dRSYoYirxB6GN0 +QPp2CUg+Yk0HtslvbKltcd0I+3FlebiiCQO+cI/lbRXKNqcG7+rPrUAM4fdapnK Olr54XX43t6Cor+D2EzO/tT7k1MCvh/qkFLwyG/W/wZKCoJwAW62X/j6bSt1Ow/9 WEAYi3x7YClOD1NTviSN4WbiYgok7KYEM3kzz+zI7bEfP/++3lM1b5oG7Cosi+pQ Lwm5XUXZF6cFSDPnM+aPHymVlQjXCrxs5zr6k9GJ3FtCt3FHBxmLFxRavMt1Dc27 SMcGUZ4= 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 v7 1/2] dma: Add devm_dma_request_chan() Date: Tue, 10 Jun 2025 10:22:53 +0200 Message-ID: <20250610082256.400492-2-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250610082256.400492-1-csokas.bence@prolan.hu> References: <20250610082256.400492-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=1749543779;VERSION=7993;MC=4106326459;ID=452479;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A296767155D62776A 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 Mon Feb 9 02:23:15 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 D9F7C28002E; Tue, 10 Jun 2025 08:23:02 +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=1749543784; cv=none; b=hHmPfMDtGZVJXhR2rwpQHnXcKT4c2P9gtO0I+2uN39hzn6sSbYqMIfUtpyf4XX+X7EuLl1+zwkS4Npi+k6psaz+hfxKURGSgEp1kbV/HBnfPe46vRDGQC3q88ByCq9VAyD2H2Bt0X7K5reWNeoaNDaF3J2YryLBCBZdSQzRhUuM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749543784; c=relaxed/simple; bh=teRKCpcCZjRrySHJh7DujU1cBHibTtbcNpxnYm/ruiU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q6T8KtnXscXgZp3TzYS5fh80MuLZeIFlDvEtwg5lcl7hjn+wKnVn6kfraZkjK1snDnzWL+fPIL9FbO+xvQH+gmsjDqXlrgKxZ0D3VXQ+uIpyY4xbG/YCA6WY6vNwxIDEh4uk8PysxEFxkOwBhClc5ev/P46om4aLQiRwBiL1JnM= 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=aeGxAGuS; 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="aeGxAGuS" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id 19A53A06EF; Tue, 10 Jun 2025 10:23:01 +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=aeGxAGuSxVT46TiaInzLbpyuWugAaXShxQHd 7JYhH280LZezFPdLjyOAJ+78ycxQzs6b6SJhd3l7TE5uAv0LYbcATx4wHzBRL6Fa S9Qxpm7+0M1rLMRyyeh9VBeq573O+6U4wbfXlnSLuRhucQtcYraMdMMqyErsp7W7 bFFL0XKAOs50acQv12bB9xG7KK5HetpLCEu+oAw5+mOoai1dlZoJP14nGFLriXiy AKPMFq1jZyRvphMuy4lB2/ci5NxQXLioiH5ej8RdyQI1CbqWbbM5sDDTyyyiVIUj jNgeLPCniB2W2LM3+2asubSdk+DUTxMBBP1PP+05sb9tV+zuEfaW6x3D7l1G0p8E eUIzDxJsyprW/0oGnEk5rTvnaoxNU9Sx4VIm6DSELemOc6/Ig8GTnP7FAOSqDgwF XRmg2BMbapGxDQnlhsKzPtLfk5QZINWj6HcoQhuKaW+qKtlPHWwde9MaWtEHYgIj lOGawqkL1VvJbLm1KwKrkVpHTtbIcJ9FVDJzykpfvJCyk+BxDYYVs20vAb3r2kHr ckRF0IlYTv/XIIIdCh1Qnr3HeYc4z0nL4EiMa8cooicukKe5BqYwDeER1+qScb5a nWfNXHOBMKeohoAI+amCFXuBDvdMyvq2BgNWJ3dh6GBlNqOJRRn+Ls7IwJpLETkq vEbjeYc= 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 v7 2/2] spi: atmel-quadspi: Use `devm_dma_request_chan()` Date: Tue, 10 Jun 2025 10:22:54 +0200 Message-ID: <20250610082256.400492-3-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250610082256.400492-1-csokas.bence@prolan.hu> References: <20250610082256.400492-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=1749543780;VERSION=7993;MC=3965923373;ID=452480;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A296767155D62776A 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