aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/amso1100/c2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/infiniband/hw/amso1100/c2.c')
-rw-r--r--drivers/infiniband/hw/amso1100/c2.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 5ce7b9e8bff6..7275e727e0f5 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -920,8 +920,7 @@ static struct net_device *c2_devinit(struct c2_dev *c2dev,
920 return netdev; 920 return netdev;
921} 921}
922 922
923static int __devinit c2_probe(struct pci_dev *pcidev, 923static int c2_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
924 const struct pci_device_id *ent)
925{ 924{
926 int ret = 0, i; 925 int ret = 0, i;
927 unsigned long reg0_start, reg0_flags, reg0_len; 926 unsigned long reg0_start, reg0_flags, reg0_len;
@@ -1191,7 +1190,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
1191 return ret; 1190 return ret;
1192} 1191}
1193 1192
1194static void __devexit c2_remove(struct pci_dev *pcidev) 1193static void c2_remove(struct pci_dev *pcidev)
1195{ 1194{
1196 struct c2_dev *c2dev = pci_get_drvdata(pcidev); 1195 struct c2_dev *c2dev = pci_get_drvdata(pcidev);
1197 struct net_device *netdev = c2dev->netdev; 1196 struct net_device *netdev = c2dev->netdev;
@@ -1236,7 +1235,7 @@ static struct pci_driver c2_pci_driver = {
1236 .name = DRV_NAME, 1235 .name = DRV_NAME,
1237 .id_table = c2_pci_table, 1236 .id_table = c2_pci_table,
1238 .probe = c2_probe, 1237 .probe = c2_probe,
1239 .remove = __devexit_p(c2_remove), 1238 .remove = c2_remove,
1240}; 1239};
1241 1240
1242static int __init c2_init_module(void) 1241static int __init c2_init_module(void)