5 files changed, 8 insertions, 36 deletions

diff --git a/drivers/parport/parport_amiga.c b/drivers/parport/parport_amiga.c
index ee78e0ee6e05..09503b8d12e6 100644
--- a/drivers/parport/parport_amiga.c
+++ b/drivers/parport/parport_amiga.c
@@ -244,20 +244,7 @@ static struct platform_driver amiga_parallel_driver = {
         },
 };
 
-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_platform_driver_probe(amiga_parallel_driver, amiga_parallel_probe);
 
 MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
 MODULE_DESCRIPTION("Parport Driver for Amiga builtin Port");
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 067ad517c1f5..e9b52e4a4648 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -193,16 +193,4 @@ static struct pcmcia_driver parport_cs_driver = {
         .remove         = parport_detach,
         .id_table       = parport_ids,
 };
-
-static int __init init_parport_cs(void)
-{
-        return pcmcia_register_driver(&parport_cs_driver);
-}
-
-static void __exit exit_parport_cs(void)
-{
-        pcmcia_unregister_driver(&parport_cs_driver);
-}
-
-module_init(init_parport_cs);
-module_exit(exit_parport_cs);
+module_pcmcia_driver(parport_cs_driver);
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 050773c36823..a5251cb5fb0c 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -246,14 +246,14 @@ struct parport *parport_gsc_probe_port(unsigned long base,
                 printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base);
                 return NULL;
         }
-        ops = kmalloc (sizeof (struct parport_operations), GFP_KERNEL);
+        ops = kmemdup(&parport_gsc_ops, sizeof(struct parport_operations),
+                      GFP_KERNEL);
         if (!ops) {
                 printk (KERN_DEBUG "parport (0x%lx): no memory for ops!\n",
                         base);
                 kfree (priv);
                 return NULL;
         }
-        memcpy (ops, &parport_gsc_ops, sizeof (struct parport_operations));
         priv->ctr = 0xc;
         priv->ctr_writable = 0xff;
         priv->dma_buf = 0;
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index 5c4b6a1db6ca..dffd6d0bd15b 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -284,12 +284,11 @@ static int bpp_probe(struct platform_device *op)
         size = resource_size(&op->resource[0]);
         dma = PARPORT_DMA_NONE;
 
-        ops = kmalloc(sizeof(struct parport_operations), GFP_KERNEL);
+        ops = kmemdup(&parport_sunbpp_ops, sizeof(struct parport_operations),
+                      GFP_KERNEL);
         if (!ops)
                 goto out_unmap;
 
-        memcpy (ops, &parport_sunbpp_ops, sizeof(struct parport_operations));
-
         dprintk(("register_port\n"));
         if (!(p = parport_register_port((unsigned long)base, irq, dma, ops)))
                 goto out_free_ops;
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index 3f56bc086cb5..92ed045a5f93 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -476,10 +476,9 @@ int parport_proc_register(struct parport *port)
         struct parport_sysctl_table *t;
         int i;
 
-        t = kmalloc(sizeof(*t), GFP_KERNEL);
+        t = kmemdup(&parport_sysctl_template, sizeof(*t), GFP_KERNEL);
         if (t == NULL)
                 return -ENOMEM;
-        memcpy(t, &parport_sysctl_template, sizeof(*t));
 
         t->device_dir[0].extra1 = port;
 
@@ -523,10 +522,9 @@ int parport_device_proc_register(struct pardevice *device)
         struct parport_device_sysctl_table *t;
         struct parport * port = device->port;
         
-        t = kmalloc(sizeof(*t), GFP_KERNEL);
+        t = kmemdup(&parport_device_sysctl_template, sizeof(*t), GFP_KERNEL);
         if (t == NULL)
                 return -ENOMEM;
-        memcpy(t, &parport_device_sysctl_template, sizeof(*t));
 
         t->dev_dir[0].child = t->parport_dir;
         t->parport_dir[0].child = t->port_dir;