Commit 07243159 authored by Martin Povišer's avatar Martin Povišer Committed by Vinod Koul
Browse files

dmaengine: apple-admac: Do not use devres for IRQs 



This is in advance of adding support for triggering the reset signal to
the peripheral, since registering the IRQ handler will have to be
sequenced with it.

Signed-off-by: default avatarMartin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20220918095845.68860-4-povik+lin@cutebit.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 0f4c5b29

drivers/dma/apple-admac.c

+18 −9
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ struct admac_data { 
	struct device *dev;

	__iomem void *base;



	int irq;

	int irq_index;

	int nchannels;

	struct admac_chan channels[];
@@ -724,12 +725,7 @@ static int admac_probe(struct platform_device *pdev) 


	if (irq < 0)

		return dev_err_probe(&pdev->dev, irq, "no usable interrupt\n");



	err = devm_request_irq(&pdev->dev, irq, admac_interrupt,

			       0, dev_name(&pdev->dev), ad);

	if (err)

		return dev_err_probe(&pdev->dev, err,

				     "unable to register interrupt\n");

	ad->irq = irq;



	ad->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(ad->base))
@@ -774,17 +770,29 @@ static int admac_probe(struct platform_device *pdev) 
		tasklet_setup(&adchan->tasklet, admac_chan_tasklet);

	}



	err = dma_async_device_register(&ad->dma);

	err = request_irq(irq, admac_interrupt, 0, dev_name(&pdev->dev), ad);

	if (err)

		return dev_err_probe(&pdev->dev, err, "failed to register DMA device\n");

		return dev_err_probe(&pdev->dev, err,

				     "unable to register interrupt\n");



	err = dma_async_device_register(&ad->dma);

	if (err) {

		dev_err_probe(&pdev->dev, err, "failed to register DMA device\n");

		goto free_irq;

	}



	err = of_dma_controller_register(pdev->dev.of_node, admac_dma_of_xlate, ad);

	if (err) {

		dma_async_device_unregister(&ad->dma);

		return dev_err_probe(&pdev->dev, err, "failed to register with OF\n");

		dev_err_probe(&pdev->dev, err, "failed to register with OF\n");

		goto free_irq;

	}



	return 0;



free_irq:

	free_irq(ad->irq, ad);

	return err;

}



static int admac_remove(struct platform_device *pdev)
@@ -793,6 +801,7 @@ static int admac_remove(struct platform_device *pdev) 


	of_dma_controller_free(pdev->dev.of_node);

	dma_async_device_unregister(&ad->dma);

	free_irq(ad->irq, ad);



	return 0;

}