diff options
Diffstat (limited to 'drivers/isdn/hardware/mISDN/avmfritz.c')
| -rw-r--r-- | drivers/isdn/hardware/mISDN/avmfritz.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c index dceaec821b0e..292991c90c02 100644 --- a/drivers/isdn/hardware/mISDN/avmfritz.c +++ b/drivers/isdn/hardware/mISDN/avmfritz.c | |||
| @@ -1034,7 +1034,7 @@ release_card(struct fritzcard *card) | |||
| 1034 | AVM_cnt--; | 1034 | AVM_cnt--; |
| 1035 | } | 1035 | } |
| 1036 | 1036 | ||
| 1037 | static int __devinit | 1037 | static int |
| 1038 | setup_instance(struct fritzcard *card) | 1038 | setup_instance(struct fritzcard *card) |
| 1039 | { | 1039 | { |
| 1040 | int i, err; | 1040 | int i, err; |
| @@ -1096,7 +1096,7 @@ error: | |||
| 1096 | return err; | 1096 | return err; |
| 1097 | } | 1097 | } |
| 1098 | 1098 | ||
| 1099 | static int __devinit | 1099 | static int |
| 1100 | fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 1100 | fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
| 1101 | { | 1101 | { |
| 1102 | int err = -ENOMEM; | 1102 | int err = -ENOMEM; |
| @@ -1130,7 +1130,7 @@ fritzpci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1130 | return err; | 1130 | return err; |
| 1131 | } | 1131 | } |
| 1132 | 1132 | ||
| 1133 | static void __devexit | 1133 | static void |
| 1134 | fritz_remove_pci(struct pci_dev *pdev) | 1134 | fritz_remove_pci(struct pci_dev *pdev) |
| 1135 | { | 1135 | { |
| 1136 | struct fritzcard *card = pci_get_drvdata(pdev); | 1136 | struct fritzcard *card = pci_get_drvdata(pdev); |
| @@ -1142,7 +1142,7 @@ fritz_remove_pci(struct pci_dev *pdev) | |||
| 1142 | pr_info("%s: drvdata already removed\n", __func__); | 1142 | pr_info("%s: drvdata already removed\n", __func__); |
| 1143 | } | 1143 | } |
| 1144 | 1144 | ||
| 1145 | static struct pci_device_id fcpci_ids[] __devinitdata = { | 1145 | static struct pci_device_id fcpci_ids[] = { |
| 1146 | { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID, | 1146 | { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID, |
| 1147 | 0, 0, (unsigned long) "Fritz!Card PCI"}, | 1147 | 0, 0, (unsigned long) "Fritz!Card PCI"}, |
| 1148 | { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID, | 1148 | { PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1_V2, PCI_ANY_ID, PCI_ANY_ID, |
| @@ -1154,7 +1154,7 @@ MODULE_DEVICE_TABLE(pci, fcpci_ids); | |||
| 1154 | static struct pci_driver fcpci_driver = { | 1154 | static struct pci_driver fcpci_driver = { |
| 1155 | .name = "fcpci", | 1155 | .name = "fcpci", |
| 1156 | .probe = fritzpci_probe, | 1156 | .probe = fritzpci_probe, |
| 1157 | .remove = __devexit_p(fritz_remove_pci), | 1157 | .remove = fritz_remove_pci, |
| 1158 | .id_table = fcpci_ids, | 1158 | .id_table = fcpci_ids, |
| 1159 | }; | 1159 | }; |
| 1160 | 1160 | ||
