linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / char / tb0219.c

diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c
index bb1bad4..ac2a297 100644 (file)
--- a/drivers/char/tb0219.c
+++ b/drivers/char/tb0219.c
@@ -255,7 +255,7 @@ static int tanbac_tb0219_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static const struct file_operations tb0219_fops = {
+static struct file_operations tb0219_fops = {
        .owner          = THIS_MODULE,
        .read           = tanbac_tb0219_read,
        .write          = tanbac_tb0219_write,
@@ -283,7 +283,7 @@ static void tb0219_pci_irq_init(void)
        vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW);
 }
 
-static int __devinit tb0219_probe(struct platform_device *dev)
+static int tb0219_probe(struct platform_device *dev)
 {
        int retval;
 
@@ -319,7 +319,7 @@ static int __devinit tb0219_probe(struct platform_device *dev)
        return 0;
 }
 
-static int __devexit tb0219_remove(struct platform_device *dev)
+static int tb0219_remove(struct platform_device *dev)
 {
        _machine_restart = old_machine_restart;
 
@@ -335,26 +335,19 @@ static struct platform_device *tb0219_platform_device;
 
 static struct platform_driver tb0219_device_driver = {
        .probe          = tb0219_probe,
-       .remove         = __devexit_p(tb0219_remove),
+       .remove         = tb0219_remove,
        .driver         = {
                .name   = "TB0219",
-               .owner  = THIS_MODULE,
        },
 };
 
-static int __init tanbac_tb0219_init(void)
+static int __devinit tanbac_tb0219_init(void)
 {
        int retval;
 
-       tb0219_platform_device = platform_device_alloc("TB0219", -1);
-       if (!tb0219_platform_device)
-               return -ENOMEM;
-
-       retval = platform_device_add(tb0219_platform_device);
-       if (retval < 0) {
-               platform_device_put(tb0219_platform_device);
-               return retval;
-       }
+       tb0219_platform_device = platform_device_register_simple("TB0219", -1, NULL, 0);
+       if (IS_ERR(tb0219_platform_device))
+               return PTR_ERR(tb0219_platform_device);
 
        retval = platform_driver_register(&tb0219_device_driver);
        if (retval < 0)
@@ -363,9 +356,10 @@ static int __init tanbac_tb0219_init(void)
        return retval;
 }
 
-static void __exit tanbac_tb0219_exit(void)
+static void __devexit tanbac_tb0219_exit(void)
 {
        platform_driver_unregister(&tb0219_device_driver);
+
        platform_device_unregister(tb0219_platform_device);
 }