Skip to content

Commit e094de1

Browse files
dlechbroonie
authored andcommitted
spi: axi-spi-engine: use devm action to reset hw on remove
This moves the reset of the hardware to a devm action in the AXI SPI Engine driver. This will allow us to use devm on later calls in the probe function while preserving the order during cleanup. Signed-off-by: David Lechner <dlechner@baylibre.com> Link: https://lore.kernel.org/r/20231117-axi-spi-engine-series-1-v1-5-cc59db999b87@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e12cd96 commit e094de1

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

drivers/spi/spi-axi-spi-engine.c

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,15 @@ static int spi_engine_transfer_one_message(struct spi_controller *host,
461461
return 0;
462462
}
463463

464+
static void spi_engine_release_hw(void *p)
465+
{
466+
struct spi_engine *spi_engine = p;
467+
468+
writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
469+
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);
470+
writel_relaxed(0x01, spi_engine->base + SPI_ENGINE_REG_RESET);
471+
}
472+
464473
static int spi_engine_probe(struct platform_device *pdev)
465474
{
466475
struct spi_engine *spi_engine;
@@ -506,6 +515,11 @@ static int spi_engine_probe(struct platform_device *pdev)
506515
writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
507516
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);
508517

518+
ret = devm_add_action_or_reset(&pdev->dev, spi_engine_release_hw,
519+
spi_engine);
520+
if (ret)
521+
return ret;
522+
509523
ret = request_irq(irq, spi_engine_irq, 0, pdev->name, host);
510524
if (ret)
511525
return ret;
@@ -532,16 +546,11 @@ static int spi_engine_probe(struct platform_device *pdev)
532546
static void spi_engine_remove(struct platform_device *pdev)
533547
{
534548
struct spi_controller *host = platform_get_drvdata(pdev);
535-
struct spi_engine *spi_engine = spi_controller_get_devdata(host);
536549
int irq = platform_get_irq(pdev, 0);
537550

538551
spi_unregister_controller(host);
539552

540553
free_irq(irq, host);
541-
542-
writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
543-
writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);
544-
writel_relaxed(0x01, spi_engine->base + SPI_ENGINE_REG_RESET);
545554
}
546555

547556
static const struct of_device_id spi_engine_match_table[] = {

0 commit comments

Comments
 (0)