diff options
Diffstat (limited to 'drivers/isdn/hardware/eicon/divasmain.c')
-rw-r--r-- | drivers/isdn/hardware/eicon/divasmain.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index ca6d276bb256..52377b4bf039 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c | |||
@@ -150,12 +150,12 @@ MODULE_DEVICE_TABLE(pci, divas_pci_tbl); | |||
150 | 150 | ||
151 | static int divas_init_one(struct pci_dev *pdev, | 151 | static int divas_init_one(struct pci_dev *pdev, |
152 | const struct pci_device_id *ent); | 152 | const struct pci_device_id *ent); |
153 | static void __devexit divas_remove_one(struct pci_dev *pdev); | 153 | static void divas_remove_one(struct pci_dev *pdev); |
154 | 154 | ||
155 | static struct pci_driver diva_pci_driver = { | 155 | static struct pci_driver diva_pci_driver = { |
156 | .name = "divas", | 156 | .name = "divas", |
157 | .probe = divas_init_one, | 157 | .probe = divas_init_one, |
158 | .remove = __devexit_p(divas_remove_one), | 158 | .remove = divas_remove_one, |
159 | .id_table = divas_pci_tbl, | 159 | .id_table = divas_pci_tbl, |
160 | }; | 160 | }; |
161 | 161 | ||
@@ -688,8 +688,7 @@ static int __init divas_register_chrdev(void) | |||
688 | /* -------------------------------------------------------------------------- | 688 | /* -------------------------------------------------------------------------- |
689 | PCI driver section | 689 | PCI driver section |
690 | -------------------------------------------------------------------------- */ | 690 | -------------------------------------------------------------------------- */ |
691 | static int __devinit divas_init_one(struct pci_dev *pdev, | 691 | static int divas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) |
692 | const struct pci_device_id *ent) | ||
693 | { | 692 | { |
694 | void *pdiva = NULL; | 693 | void *pdiva = NULL; |
695 | u8 pci_latency; | 694 | u8 pci_latency; |
@@ -749,7 +748,7 @@ static int __devinit divas_init_one(struct pci_dev *pdev, | |||
749 | return (0); | 748 | return (0); |
750 | } | 749 | } |
751 | 750 | ||
752 | static void __devexit divas_remove_one(struct pci_dev *pdev) | 751 | static void divas_remove_one(struct pci_dev *pdev) |
753 | { | 752 | { |
754 | void *pdiva = pci_get_drvdata(pdev); | 753 | void *pdiva = pci_get_drvdata(pdev); |
755 | 754 | ||