From patchwork Fri Feb 7 12:47:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= X-Patchwork-Id: 863260 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 4C4D51E261F; Fri, 7 Feb 2025 12:48:10 +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=1738932494; cv=none; b=fUkJtWzbntGN7GfYk9SQk72z4Z/jdrSpjO7Ea7de+VxIRNRYxHwbzRtGfMEo7hD+JU8rYXDhbz/EncHlL1kf71DW5moqXs8kCva0zrxsgZSrvTHpI3KTFNhAtmEm9shvDt2LVCZk7+boHdzPHz7CPUogbq16VmymIqaMR5e+BbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738932494; c=relaxed/simple; bh=epku/j8X4GjSIG5flo+ZN8vsdWinTiQ7kI3SLzVqYIA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=e0R7ahY19ecytslur3imHaNCsvJsbtl05+Pbs7ZoTTfmC29K/vMMnbunM7laZ/ikoly0M5hqRL8Qz4sG12TY+Fdm5u/RWwQSPPaS7VVse6rleswR47TdFl4fMI0C/A6aMB3B6JoNkPPCaOAHKyFnoWPNh6cnrhQAkOJZF14b1Ec= 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=DXvx0o34; 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="DXvx0o34" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id A63C7A1756; Fri, 7 Feb 2025 13:48:08 +0100 (CET) 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=EN5uKDKBs2TFBzx+EqNY KD0FORICT1RtSymVEFjrtcw=; b=DXvx0o34J8tTdtOgr4q89tlci9jbO0RrQ6fW TXNr7u1PtxCsnh1BOEsqRK97S3nrRPxf4GT7h8Gs0bKnTLAE/z/JwbaRRqbQDTYN dD7s3YOw/jqtY4Wu8Jh8E46tn98ERfdFCavJR5OLn7cSGbK2gy8ITCkzEK3jVYNA DvAoWLv0Euejeb0kHXdMxiy+nEQ/cXxrNcbChdCtl2nyduSoe2xpQ4yBCteGFQ6F v/E+zIpAFn7+/QCptZZNjNHabqZOYi/wlE1IhoDuoOKaubX7AE7wmyxfgkjh0m8d U4QWu6hLhQjA6TTltdO2GsfZ/SRmgj6LEayrIp75UclgXB/UqhIn5kN/PAqm/c5T lkFPvRBqTNqyL9hyhmDsL4KZ0foqda9txlMoj/uvYvFwuRKKt0jJohUzLXO24S3d N109isuNKJzQSwvZ2TJLdZQqFD71W7r4AjXH0Dmq6SDHMrkE/kjAiMdAlBfbrGae nT8HgY51NWk9EPaM4R+BB0HLz/AiqWC7cXPHVMTmVR/PQPiNYTPIjfcwVnzuK8h/ 7uohdHTTg7g5iOMz0e+96WvyX1lAqpjK3xl4C0EOk1BiltDqV6E4z+30hQ+kHT9H EAd7c/vb3Qd3/ix1vbt1au1oYqvfoZ+8kmFMwL+A/OwqOYBcu9/inCAjVFcG3qI3 T4orMqc= From: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= To: , , CC: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= , Mark Brown , Nicolas Ferre , "Alexandre Belloni" , Claudiu Beznea Subject: [PATCH for-6.14 v3 3/4] spi: atmel-quadspi: Use `devm_dma_request_chan()` Date: Fri, 7 Feb 2025 13:47:58 +0100 Message-ID: <20250207124802.165408-4-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207124802.165408-1-csokas.bence@prolan.hu> References: <20250207124802.165408-1-csokas.bence@prolan.hu> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ESET-AS: R=OK; S=0; OP=CALC; TIME=1738932487; VERSION=7985; MC=1603935075; ID=401535; TRN=0; CRV=0; IPC=; SP=0; SIPS=0; PI=3; F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A29ACD94852617560 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ókás --- drivers/spi/atmel-quadspi.c | 44 ++++++++++--------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index abdc49d9d940..b1fb4426c78d 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -1288,18 +1288,20 @@ static int atmel_qspi_dma_init(struct spi_controller *ctrl) struct atmel_qspi *aq = spi_controller_get_devdata(ctrl); int ret; - aq->rx_chan = dma_request_chan(&aq->pdev->dev, "rx"); + aq->rx_chan = devm_dma_request_chan(&aq->pdev->dev, "rx"); if (IS_ERR(aq->rx_chan)) { aq->rx_chan = NULL; return dev_err_probe(&aq->pdev->dev, PTR_ERR(aq->rx_chan), "RX DMA channel is not available\n"); } - aq->tx_chan = dma_request_chan(&aq->pdev->dev, "tx"); + aq->tx_chan = devm_dma_request_chan(&aq->pdev->dev, "tx"); if (IS_ERR(aq->tx_chan)) { ret = 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 = NULL; + aq->tx_chan = NULL; + return ret; } ctrl->dma_rx = aq->rx_chan; @@ -1310,20 +1312,6 @@ static int atmel_qspi_dma_init(struct spi_controller *ctrl) dma_chan_name(aq->tx_chan), dma_chan_name(aq->rx_chan)); return 0; - -release_rx_chan: - dma_release_channel(aq->rx_chan); - aq->rx_chan = NULL; - aq->tx_chan = 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); } static const struct atmel_qspi_ops atmel_qspi_ops = { @@ -1428,14 +1416,13 @@ static int atmel_qspi_probe(struct platform_device *pdev) /* Request the IRQ */ irq = platform_get_irq(pdev, 0); - if (irq < 0) { - err = irq; - goto dma_release; - } + if (irq < 0) + return irq; + err = devm_request_irq(&pdev->dev, irq, atmel_qspi_interrupt, 0, dev_name(&pdev->dev), aq); if (err) - goto dma_release; + return err; pm_runtime_set_autosuspend_delay(&pdev->dev, 500); pm_runtime_use_autosuspend(&pdev->dev); @@ -1445,7 +1432,7 @@ static int atmel_qspi_probe(struct platform_device *pdev) err = atmel_qspi_init(aq); if (err) - goto dma_release; + return err; err = spi_register_controller(ctrl); if (err) { @@ -1453,18 +1440,12 @@ static int atmel_qspi_probe(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); pm_runtime_set_suspended(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev); - goto dma_release; + return err; } pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev); return 0; - -dma_release: - if (aq->caps->has_dma) - atmel_qspi_dma_release(aq); - - return err; } static int atmel_qspi_sama7g5_suspend(struct atmel_qspi *aq) @@ -1514,9 +1495,6 @@ static void atmel_qspi_remove(struct platform_device *pdev) ret = pm_runtime_get_sync(&pdev->dev); if (ret >= 0) { - if (aq->caps->has_dma) - atmel_qspi_dma_release(aq); - if (aq->caps->has_gclk) { ret = atmel_qspi_sama7g5_suspend(aq); if (ret)