aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb/cxgb2.c')
-rw-r--r--drivers/net/ethernet/chelsio/cxgb/cxgb2.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
index 1d17c92f2dda..c8fdeaae56c0 100644
--- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
@@ -974,8 +974,7 @@ static const struct net_device_ops cxgb_netdev_ops = {
974#endif 974#endif
975}; 975};
976 976
977static int __devinit init_one(struct pci_dev *pdev, 977static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
978 const struct pci_device_id *ent)
979{ 978{
980 static int version_printed; 979 static int version_printed;
981 980
@@ -1332,7 +1331,7 @@ static inline void t1_sw_reset(struct pci_dev *pdev)
1332 pci_write_config_dword(pdev, A_PCICFG_PM_CSR, 0); 1331 pci_write_config_dword(pdev, A_PCICFG_PM_CSR, 0);
1333} 1332}
1334 1333
1335static void __devexit remove_one(struct pci_dev *pdev) 1334static void remove_one(struct pci_dev *pdev)
1336{ 1335{
1337 struct net_device *dev = pci_get_drvdata(pdev); 1336 struct net_device *dev = pci_get_drvdata(pdev);
1338 struct adapter *adapter = dev->ml_priv; 1337 struct adapter *adapter = dev->ml_priv;
@@ -1361,7 +1360,7 @@ static struct pci_driver driver = {
1361 .name = DRV_NAME, 1360 .name = DRV_NAME,
1362 .id_table = t1_pci_tbl, 1361 .id_table = t1_pci_tbl,
1363 .probe = init_one, 1362 .probe = init_one,
1364 .remove = __devexit_p(remove_one), 1363 .remove = remove_one,
1365}; 1364};
1366 1365
1367static int __init t1_init_module(void) 1366static int __init t1_init_module(void)