1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 9025edd7dc45..8a89dd1f2654 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -347,8 +347,8 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
 
         clk_prepare_enable(bs->clk);
 
-        err = request_irq(bs->irq, bcm2835_spi_interrupt, 0,
-                        dev_name(&pdev->dev), master);
+        err = devm_request_irq(&pdev->dev, bs->irq, bcm2835_spi_interrupt, 0,
+                                dev_name(&pdev->dev), master);
         if (err) {
                 dev_err(&pdev->dev, "could not request IRQ: %d\n", err);
                 goto out_clk_disable;
@@ -361,13 +361,11 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
         err = devm_spi_register_master(&pdev->dev, master);
         if (err) {
                 dev_err(&pdev->dev, "could not register SPI master: %d\n", err);
-                goto out_free_irq;
+                goto out_clk_disable;
         }
 
         return 0;
 
-out_free_irq:
-        free_irq(bs->irq, master);
 out_clk_disable:
         clk_disable_unprepare(bs->clk);
 out_master_put:
@@ -380,8 +378,6 @@ static int bcm2835_spi_remove(struct platform_device *pdev)
         struct spi_master *master = platform_get_drvdata(pdev);
         struct bcm2835_spi *bs = spi_master_get_devdata(master);
 
-        free_irq(bs->irq, master);
-
         /* Clear FIFOs, and disable the HW block */
         bcm2835_wr(bs, BCM2835_SPI_CS,
                    BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);