* [PATCH v2] spi/xilinx: Simplify irq allocation
@ 2013-07-09 16:05 Michal Simek
2013-07-10 9:07 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Michal Simek @ 2013-07-09 16:05 UTC (permalink / raw)
To: Mark Brown; +Cc: Michal Simek, Grant Likely, linux-spi, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2965 bytes --]
Use devm_request_irq() for irq allocation which
simplify driver code.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2:
- Disable interrupts in xilinx_spi_remove() to be sure
that interrupt won't come between struct freeing
and devres irq unregistration.
---
drivers/spi/spi-xilinx.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 1c33720..fea815c 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -359,7 +359,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;
@@ -379,10 +379,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;
@@ -409,8 +405,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
@@ -444,19 +438,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",
@@ -470,8 +470,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);
@@ -482,9 +480,14 @@ static int xilinx_spi_remove(struct platform_device *pdev)
{
struct spi_master *master = platform_get_drvdata(pdev);
struct xilinx_spi *xspi = spi_master_get_devdata(master);
+ void __iomem *regs_base = xspi->regs;
spi_bitbang_stop(&xspi->bitbang);
- free_irq(xspi->irq, xspi);
+
+ /* Disable all the interrupts just in case */
+ xspi->write_fn(0, regs_base + XIPIF_V123B_IIER_OFFSET);
+ /* Disable the global IPIF interrupt */
+ xspi->write_fn(0, regs_base + XIPIF_V123B_DGIER_OFFSET);
spi_master_put(xspi->bitbang.master);
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] spi/xilinx: Simplify irq allocation
2013-07-09 16:05 [PATCH v2] spi/xilinx: Simplify irq allocation Michal Simek
@ 2013-07-10 9:07 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2013-07-10 9:07 UTC (permalink / raw)
To: Michal Simek; +Cc: Michal Simek, Grant Likely, linux-spi, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
On Tue, Jul 09, 2013 at 06:05:16PM +0200, Michal Simek wrote:
> Use devm_request_irq() for irq allocation which
> simplify driver code.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-10 9:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-09 16:05 [PATCH v2] spi/xilinx: Simplify irq allocation Michal Simek
2013-07-10 9:07 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).