diff options
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/ioc4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c index 60b0b1a4fb3a..09dcb699e667 100644 --- a/drivers/misc/ioc4.c +++ b/drivers/misc/ioc4.c | |||
@@ -138,7 +138,7 @@ ioc4_unregister_submodule(struct ioc4_submodule *is) | |||
138 | * even though the following code utilizes external interrupt registers | 138 | * even though the following code utilizes external interrupt registers |
139 | * to perform the speed calculation. | 139 | * to perform the speed calculation. |
140 | */ | 140 | */ |
141 | static void | 141 | static void __devinit |
142 | ioc4_clock_calibrate(struct ioc4_driver_data *idd) | 142 | ioc4_clock_calibrate(struct ioc4_driver_data *idd) |
143 | { | 143 | { |
144 | union ioc4_int_out int_out; | 144 | union ioc4_int_out int_out; |
@@ -230,7 +230,7 @@ ioc4_clock_calibrate(struct ioc4_driver_data *idd) | |||
230 | * on the same PCI bus at slot number 3 to differentiate IO9 from IO10. | 230 | * on the same PCI bus at slot number 3 to differentiate IO9 from IO10. |
231 | * If neither is present, it's a PCI-RT. | 231 | * If neither is present, it's a PCI-RT. |
232 | */ | 232 | */ |
233 | static unsigned int | 233 | static unsigned int __devinit |
234 | ioc4_variant(struct ioc4_driver_data *idd) | 234 | ioc4_variant(struct ioc4_driver_data *idd) |
235 | { | 235 | { |
236 | struct pci_dev *pdev = NULL; | 236 | struct pci_dev *pdev = NULL; |
@@ -269,7 +269,7 @@ ioc4_variant(struct ioc4_driver_data *idd) | |||
269 | return IOC4_VARIANT_PCI_RT; | 269 | return IOC4_VARIANT_PCI_RT; |
270 | } | 270 | } |
271 | 271 | ||
272 | static void | 272 | static void __devinit |
273 | ioc4_load_modules(struct work_struct *work) | 273 | ioc4_load_modules(struct work_struct *work) |
274 | { | 274 | { |
275 | /* arg just has to be freed */ | 275 | /* arg just has to be freed */ |
@@ -280,7 +280,7 @@ ioc4_load_modules(struct work_struct *work) | |||
280 | } | 280 | } |
281 | 281 | ||
282 | /* Adds a new instance of an IOC4 card */ | 282 | /* Adds a new instance of an IOC4 card */ |
283 | static int | 283 | static int __devinit |
284 | ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) | 284 | ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) |
285 | { | 285 | { |
286 | struct ioc4_driver_data *idd; | 286 | struct ioc4_driver_data *idd; |
@@ -425,7 +425,7 @@ out: | |||
425 | } | 425 | } |
426 | 426 | ||
427 | /* Removes a particular instance of an IOC4 card. */ | 427 | /* Removes a particular instance of an IOC4 card. */ |
428 | static void | 428 | static void __devexit |
429 | ioc4_remove(struct pci_dev *pdev) | 429 | ioc4_remove(struct pci_dev *pdev) |
430 | { | 430 | { |
431 | struct ioc4_submodule *is; | 431 | struct ioc4_submodule *is; |
@@ -476,7 +476,7 @@ static struct pci_driver ioc4_driver = { | |||
476 | .name = "IOC4", | 476 | .name = "IOC4", |
477 | .id_table = ioc4_id_table, | 477 | .id_table = ioc4_id_table, |
478 | .probe = ioc4_probe, | 478 | .probe = ioc4_probe, |
479 | .remove = ioc4_remove, | 479 | .remove = __devexit_p(ioc4_remove), |
480 | }; | 480 | }; |
481 | 481 | ||
482 | MODULE_DEVICE_TABLE(pci, ioc4_id_table); | 482 | MODULE_DEVICE_TABLE(pci, ioc4_id_table); |
@@ -486,14 +486,14 @@ MODULE_DEVICE_TABLE(pci, ioc4_id_table); | |||
486 | *********************/ | 486 | *********************/ |
487 | 487 | ||
488 | /* Module load */ | 488 | /* Module load */ |
489 | static int __devinit | 489 | static int __init |
490 | ioc4_init(void) | 490 | ioc4_init(void) |
491 | { | 491 | { |
492 | return pci_register_driver(&ioc4_driver); | 492 | return pci_register_driver(&ioc4_driver); |
493 | } | 493 | } |
494 | 494 | ||
495 | /* Module unload */ | 495 | /* Module unload */ |
496 | static void __devexit | 496 | static void __exit |
497 | ioc4_exit(void) | 497 | ioc4_exit(void) |
498 | { | 498 | { |
499 | /* Ensure ioc4_load_modules() has completed before exiting */ | 499 | /* Ensure ioc4_load_modules() has completed before exiting */ |