Changeset 3148
- Timestamp:
- 10/30/05 10:58:08 (3 years ago)
- Files:
-
- lm-sensors/trunk/kernel/busses/i2c-via.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
lm-sensors/trunk/kernel/busses/i2c-via.c
r2802 r3148 116 116 117 117 118 static struct pci_device_id vt586b_ids[] __ devinitdata = {118 static struct pci_device_id vt586b_ids[] __initdata = { 119 119 { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, 120 120 { 0, } 121 121 }; 122 122 123 static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_id *id) 123 static int __init vt586b_probe(struct pci_dev *dev, 124 const struct pci_device_id *id) 124 125 { 125 126 u16 base; … … 168 169 } 169 170 170 static void __devexit vt586b_remove(struct pci_dev *dev)171 {172 i2c_bit_del_bus(&vt586b_adapter);173 release_region(I2C_DIR, IOSPACE);174 pm_io_base = 0;175 }176 177 178 /* Don't register driver to avoid driver conflicts */179 /*180 static struct pci_driver vt586b_driver = {181 .name = "vt586b smbus",182 .id_table = vt586b_ids,183 .probe = vt586b_probe,184 .remove = __devexit_p(vt586b_remove),185 };186 */187 188 171 static int __init i2c_vt586b_init(void) 189 172 { … … 192 175 193 176 printk("i2c-via.o version %s (%s)\n", LM_VERSION, LM_DATE); 194 /*195 return pci_module_init(&vt586b_driver);196 */197 177 pci_for_each_dev(dev) { 198 178 id = pci_match_device(vt586b_ids, dev); … … 207 187 static void __exit i2c_vt586b_exit(void) 208 188 { 209 /* 210 pci_unregister_driver(&vt586b_driver); 211 */ 212 vt586b_remove(NULL); 189 i2c_bit_del_bus(&vt586b_adapter); 190 release_region(I2C_DIR, IOSPACE); 213 191 } 214 192
