Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[pandora-kernel.git] / drivers / parport / parport_amiga.c

diff --git a/drivers/parport/parport_amiga.c b/drivers/parport/parport_amiga.c
index a0afaee..8bef6d6 100644 (file)
--- a/drivers/parport/parport_amiga.c
+++ b/drivers/parport/parport_amiga.c
@@ -18,6 +18,8 @@
 #include <linux/parport.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
+
 #include <asm/setup.h>
 #include <asm/amigahw.h>
 #include <asm/irq.h>
@@ -31,7 +33,6 @@
 #define DPRINTK(x...)  do { } while (0)
 #endif
 
-static struct parport *this_port = NULL;
 
 static void amiga_write_data(struct parport *p, unsigned char data)
 {
@@ -137,13 +138,6 @@ static unsigned char amiga_read_status(struct parport *p)
        return status;
 }
 
-/* as this ports irq handling is already done, we use a generic funktion */
-static irqreturn_t amiga_interrupt(int irq, void *dev_id)
-{
-       parport_generic_irq(irq, (struct parport *) dev_id);
-       return IRQ_HANDLED;
-}
-
 static void amiga_enable_irq(struct parport *p)
 {
        enable_irq(IRQ_AMIGA_CIAA_FLG);
@@ -234,18 +228,11 @@ static struct parport_operations pp_amiga_ops = {
 
 /* ----------- Initialisation code --------------------------------- */
 
-static int __init parport_amiga_init(void)
+static int __init amiga_parallel_probe(struct platform_device *pdev)
 {
        struct parport *p;
        int err;
 
-       if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_PARALLEL))
-               return -ENODEV;
-
-       err = -EBUSY;
-       if (!request_mem_region(CIAA_PHYSADDR-1+0x100, 0x100, "parallel"))
-               goto out_mem;
-
        ciaa.ddrb = 0xff;
        ciab.ddra &= 0xf8;
        mb();
@@ -253,41 +240,63 @@ static int __init parport_amiga_init(void)
        p = parport_register_port((unsigned long)&ciaa.prb, IRQ_AMIGA_CIAA_FLG,
                                   PARPORT_DMA_NONE, &pp_amiga_ops);
        if (!p)
-               goto out_port;
+               return -EBUSY;
 
-       err = request_irq(IRQ_AMIGA_CIAA_FLG, amiga_interrupt, 0, p->name, p);
+       err = request_irq(IRQ_AMIGA_CIAA_FLG, parport_irq_handler, 0, p->name,
+                         p);
        if (err)
                goto out_irq;
 
-       this_port = p;
        printk(KERN_INFO "%s: Amiga built-in port using irq\n", p->name);
        /* XXX: set operating mode */
        parport_announce_port(p);
 
+       platform_set_drvdata(pdev, p);
+
        return 0;
 
 out_irq:
        parport_put_port(p);
-out_port:
-       release_mem_region(CIAA_PHYSADDR-1+0x100, 0x100);
-out_mem:
        return err;
 }
 
-static void __exit parport_amiga_exit(void)
+static int __exit amiga_parallel_remove(struct platform_device *pdev)
 {
-       parport_remove_port(this_port);
-       if (this_port->irq != PARPORT_IRQ_NONE)
-               free_irq(IRQ_AMIGA_CIAA_FLG, this_port);
-       parport_put_port(this_port);
-       release_mem_region(CIAA_PHYSADDR-1+0x100, 0x100);
+       struct parport *port = platform_get_drvdata(pdev);
+
+       parport_remove_port(port);
+       if (port->irq != PARPORT_IRQ_NONE)
+               free_irq(IRQ_AMIGA_CIAA_FLG, port);
+       parport_put_port(port);
+       platform_set_drvdata(pdev, NULL);
+       return 0;
 }
 
+static struct platform_driver amiga_parallel_driver = {
+       .remove = __exit_p(amiga_parallel_remove),
+       .driver   = {
+               .name   = "amiga-parallel",
+               .owner  = THIS_MODULE,
+       },
+};
+
+static int __init amiga_parallel_init(void)
+{
+       return platform_driver_probe(&amiga_parallel_driver,
+                                    amiga_parallel_probe);
+}
+
+module_init(amiga_parallel_init);
+
+static void __exit amiga_parallel_exit(void)
+{
+       platform_driver_unregister(&amiga_parallel_driver);
+}
+
+module_exit(amiga_parallel_exit);
 
 MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
 MODULE_DESCRIPTION("Parport Driver for Amiga builtin Port");
 MODULE_SUPPORTED_DEVICE("Amiga builtin Parallel Port");
 MODULE_LICENSE("GPL");
-
-module_init(parport_amiga_init)
-module_exit(parport_amiga_exit)
+MODULE_ALIAS("platform:amiga-parallel");