Thread (10 messages) 10 messages, 5 authors, 2017-01-08

Re: [PATCH] serial: 8250_lpss: Release Quark MSI vectors on exit

From: Andy Shevchenko <hidden>
Date: 2017-01-04 22:20:00
Also in: lkml

On Wed, Jan 4, 2017 at 9:36 PM, Jan Kiszka [off-list ref] wrote:
No one seems to do this magically in the background, so we have to do
the job in the exit handler that corresponds to the board setup handler.

Fixes: 60a9244a5d14 ("serial: 8250_lpss: enable MSI for Intel Quark")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
NAK, check the PCI devres code, please.

Christoph, can you amend documentation to make this clear?

I NAKed already third patch related to PCI managed resources (couple
of those regarding to pci_irq_* API)/
quoted hunk ↗ jump to hunk
---
 drivers/tty/serial/8250/8250_lpss.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c
index 58cbb30..f09f68a 100644
--- a/drivers/tty/serial/8250/8250_lpss.c
+++ b/drivers/tty/serial/8250/8250_lpss.c
@@ -47,7 +47,7 @@ struct lpss8250_board {
        unsigned long freq;
        unsigned int base_baud;
        int (*setup)(struct lpss8250 *, struct uart_port *p);
-       void (*exit)(struct lpss8250 *);
+       void (*exit)(struct lpss8250 *, struct pci_dev *pdev);
 };

 struct lpss8250 {
@@ -226,9 +226,10 @@ static int qrk_serial_setup(struct lpss8250 *lpss, struct uart_port *port)
        return 0;
 }

-static void qrk_serial_exit(struct lpss8250 *lpss)
+static void qrk_serial_exit(struct lpss8250 *lpss, struct pci_dev *pdev)
 {
        qrk_serial_exit_dma(lpss);
+       pci_free_irq_vectors(pdev);
 }

 static bool lpss8250_dma_filter(struct dma_chan *chan, void *param)
@@ -324,7 +325,7 @@ static int lpss8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)

 err_exit:
        if (lpss->board->exit)
-               lpss->board->exit(lpss);
+               lpss->board->exit(lpss, pdev);
        return ret;
 }
@@ -333,7 +334,7 @@ static void lpss8250_remove(struct pci_dev *pdev)
        struct lpss8250 *lpss = pci_get_drvdata(pdev);

        if (lpss->board->exit)
-               lpss->board->exit(lpss);
+               lpss->board->exit(lpss, pdev);

        serial8250_unregister_port(lpss->line);
 }
--
2.1.4


-- 
With Best Regards,
Andy Shevchenko
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help