Merge tag 'for-5.15/parisc' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / drivers / parport / parport_gsc.c

diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 1e43b3f..0dcc497 100644 (file)
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -378,7 +378,7 @@ static int __init parport_init_chip(struct parisc_device *dev)
        return 0;
 }
 
-static int __exit parport_remove_chip(struct parisc_device *dev)
+static void __exit parport_remove_chip(struct parisc_device *dev)
 {
        struct parport *p = dev_get_drvdata(&dev->dev);
        if (p) {
@@ -390,14 +390,12 @@ static int __exit parport_remove_chip(struct parisc_device *dev)
                if (p->irq != PARPORT_IRQ_NONE)
                        free_irq(p->irq, p);
                if (priv->dma_buf)
-                       pci_free_consistent(priv->dev, PAGE_SIZE,
-                                           priv->dma_buf,
-                                           priv->dma_handle);
+                       dma_free_coherent(&priv->dev->dev, PAGE_SIZE,
+                                         priv->dma_buf, priv->dma_handle);
                kfree (p->private_data);
                parport_put_port(p);
                kfree (ops); /* hope no-one cached it */
        }
-       return 0;
 }
 
 static const struct parisc_device_id parport_tbl[] __initconst = {