[06/14] spi: axi-spi-engine: use devm_request_irq()

Message ID	20231117-axi-spi-engine-series-1-v1-6-cc59db999b87@baylibre.com
State	Accepted
Commit	076f32d5db73f16c95b38149f9168210cf267b33
Headers	show Return-Path: <linux-spi-owner@vger.kernel.org> From: David Lechner <dlechner@baylibre.com> To: linux-spi@vger.kernel.org, devicetree@vger.kernel.org Cc: David Lechner <dlechner@baylibre.com>, Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Michael Hennerich <Michael.Hennerich@analog.com>, =?utf-8?q?Nuno_S=C3=A1?= <nuno.sa@analog.com>, Lars-Peter Clausen <lars@metafoo.de>, linux-kernel@vger.kernel.org Subject: [PATCH 06/14] spi: axi-spi-engine: use devm_request_irq() Date: Fri, 17 Nov 2023 14:12:57 -0600 Message-ID: <20231117-axi-spi-engine-series-1-v1-6-cc59db999b87@baylibre.com> In-Reply-To: <20231117-axi-spi-engine-series-1-v1-0-cc59db999b87@baylibre.com> References: <20231117-axi-spi-engine-series-1-v1-0-cc59db999b87@baylibre.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk
Series	spi: axi-spi-engine improvements \| expand [00/14] spi: axi-spi-engine improvements [01/14] dt-bindings: spi: axi-spi-engine: convert to yaml [02/14] MAINTAINERS: add entry for AXI SPI Engine [03/14] spi: axi-spi-engine: simplify driver data allocation [04/14] spi: axi-spi-engine: use devm_spi_alloc_host() [05/14] spi: axi-spi-engine: use devm action to reset hw on remove [06/14] spi: axi-spi-engine: use devm_request_irq() [07/14] spi: axi-spi-engine: use devm_spi_register_controller() [08/14] spi: axi-spi-engine: check for valid clock rate [09/14] spi: axi-spi-engine: move msg state to new struct [10/14] spi: axi-spi-engine: use message_prepare/unprepare [11/14] spi: axi-spi-engine: remove completed_id from driver state [12/14] spi: axi-spi-engine: remove struct spi_engine::msg [13/14] spi: axi-spi-engine: add support for cs_off [14/14] spi: axi-spi-engine: add support for any word size

Message ID

20231117-axi-spi-engine-series-1-v1-6-cc59db999b87@baylibre.com

State

Accepted

Commit

076f32d5db73f16c95b38149f9168210cf267b33

Headers

From: David Lechner <dlechner@baylibre.com>
To: linux-spi@vger.kernel.org, devicetree@vger.kernel.org
Cc: David Lechner <dlechner@baylibre.com>, Mark Brown <broonie@kernel.org>,
 Rob Herring <robh+dt@kernel.org>,
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
 Conor Dooley <conor+dt@kernel.org>,
 Michael Hennerich <Michael.Hennerich@analog.com>,
 =?utf-8?q?Nuno_S=C3=A1?= <nuno.sa@analog.com>,
 Lars-Peter Clausen <lars@metafoo.de>, linux-kernel@vger.kernel.org
Subject: [PATCH 06/14] spi: axi-spi-engine: use devm_request_irq()
Date: Fri, 17 Nov 2023 14:12:57 -0600
Message-ID: <20231117-axi-spi-engine-series-1-v1-6-cc59db999b87@baylibre.com>
In-Reply-To: <20231117-axi-spi-engine-series-1-v1-0-cc59db999b87@baylibre.com>
References: <20231117-axi-spi-engine-series-1-v1-0-cc59db999b87@baylibre.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

spi: axi-spi-engine improvements | expand

Commit Message

David Lechner Nov. 17, 2023, 8:12 p.m. UTC

This replaces request_irq() with devm_request_irq() in the AXI SPI
Engine driver. This simplifies the error path and removes the need to
call free_irq() in the remove function.

Signed-off-by: David Lechner <dlechner@baylibre.com>
---
 drivers/spi/spi-axi-spi-engine.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c
index c18a4b34777e..81d7352d2b8b 100644
--- a/drivers/spi/spi-axi-spi-engine.c
+++ b/drivers/spi/spi-axi-spi-engine.c
@@ -520,7 +520,8 @@  static int spi_engine_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host);
+	ret = devm_request_irq(&pdev->dev, irq, spi_engine_irq, 0, pdev->name,
+			       host);
 	if (ret)
 		return ret;
 
@@ -533,24 +534,18 @@  static int spi_engine_probe(struct platform_device *pdev)
 
 	ret = spi_register_controller(host);
 	if (ret)
-		goto err_free_irq;
+		return ret;
 
 	platform_set_drvdata(pdev, host);
 
 	return 0;
-err_free_irq:
-	free_irq(irq, host);
-	return ret;
 }
 
 static void spi_engine_remove(struct platform_device *pdev)
 {
 	struct spi_controller *host = platform_get_drvdata(pdev);
-	int irq = platform_get_irq(pdev, 0);
 
 	spi_unregister_controller(host);
-
-	free_irq(irq, host);
 }
 
 static const struct of_device_id spi_engine_match_table[] = {

[06/14] spi: axi-spi-engine: use devm_request_irq()

Commit Message

Patch