From patchwork Mon Mar 17 13:53:38 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: 14019593 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 AB71F23ED7A; Mon, 17 Mar 2025 13:53:54 +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=1742219636; cv=none; b=OruP0oNTrMX3P4RGGsD6ExqJS+nJGHgpxRKsAdvgiXBanffhNwButPROhoWaHtCeJNvvVnjwnxnM3ke3mqTCFMzzQfq/4R70+JKOVA1Jz5DVlv4oo0tKldD6+zAPXHsZvryNFEHhSF6fjtW+8tBPKuMbzrYmkbtD6+1thLCGmKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742219636; c=relaxed/simple; bh=zy0JECI5C2RinVk5OhWmti6/vR/9Y/nyi1D1qGwSO4U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YEjMa3LAXFG5MeOWt4QTYTHifQIX9GVVJmjKAi+b6attHbdsRmNQFqavY2QHhjclqNTt7RtlE1L3LtinTBjdb5a9xCVH8dxNhm3CbLzhzo3sM8i8EvjpO5i26kKMz/0w19+iA6TG4vYQD5OEv117pSorX5U7qkjifQQvYEDyoxQ= 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=r17N6Aqk; 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="r17N6Aqk" Received: from proxmox-mailgw.intranet.prolan.hu (localhost.localdomain [127.0.0.1]) by proxmox-mailgw.intranet.prolan.hu (Proxmox) with ESMTP id D3721A048F; Mon, 17 Mar 2025 14:53:52 +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=IN/XIQOFZsaQsG3NlzPE ec8MNAZUwyS8e5k9emm1aR4=; b=r17N6AqkH2nrl776BcAgkfoOBfNYNWpMJyRT tfm0nmskGT4MHAC6D7MpzCAQ6X1CEwHSOB25ZdyUs7XbHep22QON+HNzM+o7FRrD f612rrVAcssZOrRHN7RTdLUna/Y/5zmGBZTs+EVgeuQD/knXpcerKcCWTWil9iiv 5qE7Hv8Q5R5tC+5d+scWEhRybWzLJogERi9OYZUqUv43rzcsadbpR3yytY0Rvehe pTLsLS7dG7dUO/hhstcpq2VUffEvGikT7NG4QCL2ipWrfJUXK2A+HtL8/t7C/2BX P8C5kNL0TCnIiL5xC79goz5unnYwctZmwwBiJwwOoDdu0s5QZh89CRzG7pdMSZGi CcHSWgfSRwKIjxJtkSZeo9isIGhWnZqlN+pJ8a4o91tZLBGgJpyLe6QU4hu5mfep W0WOn+U1g53KRHONKJQWJkotHbWWevRfxjvXMF8rm5pIubj2qCyHuRGYbnOUJa60 jUYkImHbHLZqR13zxshALb7gkOolehqbijBmFWurMNiX9NyBWn9s5qP5iivDVH9n kEAGv74OOEOfZOqQ7BixsUDO06n6kqXhD5Yo33gfnj+x2/Wio56zjnBYhtTgg0yf AaJXhhUfZCDp0+UzVeL7IxLj7R4EbW2AClT/Y0BVddMr567WVcNxsArdJ6Yp9ybt 4/RMeM4= From: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= To: , , CC: =?utf-8?b?QmVuY2UgQ3PDs2vDoXM=?= , Mark Brown , Nicolas Ferre , "Alexandre Belloni" , Claudiu Beznea Subject: [PATCH v4 2/2] spi: atmel-quadspi: Use `devm_dma_request_chan()` Date: Mon, 17 Mar 2025 14:53:38 +0100 Message-ID: <20250317135340.382532-3-csokas.bence@prolan.hu> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250317135340.382532-1-csokas.bence@prolan.hu> References: <20250317135340.382532-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=1742219632;VERSION=7985;MC=3462887496;ID=155900;TRN=0;CRV=0;IPC=;SP=0;SIPS=0;PI=3;F=0 X-ESET-Antispam: OK X-EsetResult: clean, is OK X-EsetId: 37303A29ACD948526D7460 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 ddd12600a6f1..8a950a20b58a 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,22 +1432,16 @@ 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) - 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) @@ -1510,9 +1491,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)