[PATCH v1 3/4] spi/xilinx: Simplify irq allocation

From: Michal Simek
Date: Mon Jul 08 2013 - 09:29:54 EST


Use devm_request_irq() for irq allocation which
simplify driver code.

Signed-off-by: Michal Simek <michal.simek@xxxxxxxxxx>
---
drivers/spi/spi-xilinx.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index c99c37b..a6bb5b0 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -363,7 +363,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
struct xilinx_spi *xspi;
struct xspi_platform_data *pdata;
struct resource *res;
- int ret, irq, num_cs = 0, bits_per_word = 8;
+ int ret, num_cs = 0, bits_per_word = 8;
struct spi_master *master;
u32 tmp;
u8 i;
@@ -391,10 +391,6 @@ static int xilinx_spi_probe(struct platform_device *pdev)
return -EINVAL;
}

- irq = platform_get_irq(pdev, 0);
- if (irq < 0)
- return -ENXIO;
-
master = spi_alloc_master(&pdev->dev, sizeof(struct xilinx_spi));
if (!master)
return -ENODEV;
@@ -421,8 +417,6 @@ static int xilinx_spi_probe(struct platform_device *pdev)
master->num_chipselect = num_cs;
master->dev.of_node = pdev->dev.of_node;

- xspi->irq = irq;
-
/*
* Detect endianess on the IP via loop bit in CR. Detection
* must be done before reset is sent because incorrect reset
@@ -456,19 +450,25 @@ static int xilinx_spi_probe(struct platform_device *pdev)
goto put_master;
}

-
/* SPI controller initializations */
xspi_init_hw(xspi);

+ xspi->irq = platform_get_irq(pdev, 0);
+ if (xspi->irq < 0) {
+ ret = xspi->irq;
+ goto put_master;
+ }
+
/* Register for SPI Interrupt */
- ret = request_irq(xspi->irq, xilinx_spi_irq, 0, XILINX_SPI_NAME, xspi);
+ ret = devm_request_irq(&pdev->dev, xspi->irq, xilinx_spi_irq, 0,
+ dev_name(&pdev->dev), xspi);
if (ret)
goto put_master;

ret = spi_bitbang_start(&xspi->bitbang);
if (ret) {
dev_err(&pdev->dev, "spi_bitbang_start FAILED\n");
- goto free_irq;
+ goto put_master;
}

dev_info(&pdev->dev, "at 0x%08llX mapped to 0x%p, irq=%d\n",
@@ -482,8 +482,6 @@ static int xilinx_spi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, master);
return 0;

-free_irq:
- free_irq(xspi->irq, xspi);
put_master:
spi_master_put(master);

@@ -495,7 +493,6 @@ static int xilinx_spi_remove(struct platform_device *pdev)
struct xilinx_spi *xspi = platform_get_drvdata(pdev);

spi_bitbang_stop(&xspi->bitbang);
- free_irq(xspi->irq, xspi);

spi_master_put(xspi->bitbang.master);

--
1.8.2.3

Attachment: pgp00000.pgp
Description: PGP signature