diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-03-26 04:34:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:35 -0400 |
commit | 8f456df9c9471bc1178725ae446a8a64285042ca (patch) | |
tree | bb5aafa7ec005928a0f3a030650dea2bbbfc6cf9 /drivers/staging | |
parent | 1cd590481edcd186dcdba7cae5a7bd5c47dfdb92 (diff) |
staging: meilhaus, annotate cpi functions
Add __devinit and __devexit to pci probe/remove. Also make pci_driver
static.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: David Kiliani <mail@davidkiliani.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/meilhaus/memain.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/meilhaus/memain.c b/drivers/staging/meilhaus/memain.c index d5aacdd5205..2631587fa05 100644 --- a/drivers/staging/meilhaus/memain.c +++ b/drivers/staging/meilhaus/memain.c | |||
@@ -103,11 +103,11 @@ static const struct file_operations me_file_operations = { | |||
103 | .release = me_release, | 103 | .release = me_release, |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct pci_driver me_pci_driver = { | 106 | static struct pci_driver me_pci_driver = { |
107 | .name = MEMAIN_NAME, | 107 | .name = MEMAIN_NAME, |
108 | .id_table = me_pci_table, | 108 | .id_table = me_pci_table, |
109 | .probe = me_probe_pci, | 109 | .probe = me_probe_pci, |
110 | .remove = me_remove_pci | 110 | .remove = __devexit_p(me_remove_pci), |
111 | }; | 111 | }; |
112 | 112 | ||
113 | /* //me_usb_driver | 113 | /* //me_usb_driver |
@@ -384,7 +384,8 @@ static me_device_t *get_dummy_instance(unsigned short vendor_id, | |||
384 | return instance; | 384 | return instance; |
385 | } | 385 | } |
386 | 386 | ||
387 | static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id) | 387 | static int __devinit me_probe_pci(struct pci_dev *dev, |
388 | const struct pci_device_id *id) | ||
388 | { | 389 | { |
389 | int err; | 390 | int err; |
390 | me_pci_constructor_t constructor = NULL; | 391 | me_pci_constructor_t constructor = NULL; |
@@ -582,7 +583,7 @@ static int insert_to_device_list(me_device_t *n_device) | |||
582 | return 0; | 583 | return 0; |
583 | } | 584 | } |
584 | 585 | ||
585 | static void me_remove_pci(struct pci_dev *dev) | 586 | static void __devexit me_remove_pci(struct pci_dev *dev) |
586 | { | 587 | { |
587 | int vendor_id = dev->vendor; | 588 | int vendor_id = dev->vendor; |
588 | int device_id = dev->device; | 589 | int device_id = dev->device; |