Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 09:20:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spi: bcm2835aux: change initialization order and switch to platform_get_irq

Browse Source 
Change the initialization order of the HW so that the interrupt
is only requested after the HW is initialized

Also the use of irq_of_parse_and_map is replaced by platform_get_irq.

Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Martin Sperl 2015-10-15 10:10:20 +00:00 committed by Mark Brown
parent 72aac02b37
commit 07bce09e11
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/spi-bcm2835aux.c
View File

@ -429,7 +429,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
goto out_master_put; goto out_master_put;
} }
bs->irq = irq_of_parse_and_map(pdev->dev.of_node, 0); bs->irq = platform_get_irq(pdev, 0);
if (bs->irq <= 0) { if (bs->irq <= 0) {
dev_err(&pdev->dev, "could not get IRQ: %d\n", bs->irq); dev_err(&pdev->dev, "could not get IRQ: %d\n", bs->irq);
err = bs->irq ? bs->irq : -ENODEV; err = bs->irq ? bs->irq : -ENODEV;
@ -451,6 +451,9 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
goto out_clk_disable; goto out_clk_disable;
} }
/* reset SPI-HW block */
bcm2835aux_spi_reset_hw(bs);
err = devm_request_irq(&pdev->dev, bs->irq, err = devm_request_irq(&pdev->dev, bs->irq,
bcm2835aux_spi_interrupt, bcm2835aux_spi_interrupt,
IRQF_SHARED, IRQF_SHARED,
@ -460,9 +463,6 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
goto out_clk_disable; goto out_clk_disable;
} }
/* reset SPI-HW block */
bcm2835aux_spi_reset_hw(bs);
err = devm_spi_register_master(&pdev->dev, master); err = devm_spi_register_master(&pdev->dev, master);
if (err) { if (err) {
dev_err(&pdev->dev, "could not register SPI master: %d\n", err); dev_err(&pdev->dev, "could not register SPI master: %d\n", err);