vserver 1.9.5.x5

[linux-2.6.git] / drivers / i2c / busses / i2c-ali1563.c

diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index ef6dd42..3571081 100644 (file)
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -306,7 +306,7 @@ static void ali1563_enable(struct pci_dev * dev)
        pci_write_config_word(dev,ALI1563_SMBBA,ctrl);
 }
 
-static int __init ali1563_setup(struct pci_dev * dev)
+static int __devinit ali1563_setup(struct pci_dev * dev)
 {
        u16 ctrl;
 
@@ -362,7 +362,7 @@ static struct i2c_adapter ali1563_adapter = {
        .algo   = &ali1563_algorithm,
 };
 
-static int __init ali1563_probe(struct pci_dev * dev,
+static int __devinit ali1563_probe(struct pci_dev * dev,
                                const struct pci_device_id * id_table)
 {
        int error;
@@ -378,32 +378,29 @@ static int __init ali1563_probe(struct pci_dev * dev,
        return error;
 }
 
-static void __exit ali1563_remove(struct pci_dev * dev)
+static void __devexit ali1563_remove(struct pci_dev * dev)
 {
        i2c_del_adapter(&ali1563_adapter);
        ali1563_shutdown(dev);
 }
 
 static struct pci_device_id __devinitdata ali1563_id_table[] = {
-       {
-               .vendor         = PCI_VENDOR_ID_AL,
-               .device         = PCI_DEVICE_ID_AL_M1563,
-               .subvendor      = PCI_ANY_ID,
-               .subdevice      = PCI_ANY_ID,
-       },
+       { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1563) },
        {},
 };
 
+MODULE_DEVICE_TABLE (pci, ali1563_id_table);
+
 static struct pci_driver ali1563_pci_driver = {
        .name           = "ali1563_i2c",
        .id_table       = ali1563_id_table,
        .probe          = ali1563_probe,
-       .remove         = ali1563_remove,
+       .remove         = __devexit_p(ali1563_remove),
 };
 
 static int __init ali1563_init(void)
 {
-       return pci_module_init(&ali1563_pci_driver);
+       return pci_register_driver(&ali1563_pci_driver);
 }
 
 module_init(ali1563_init);