diff options
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 1eef0bf36aa6..0110db1d0a34 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
| @@ -54,9 +54,9 @@ static int qlcnic_config_npars; | |||
| 54 | module_param(qlcnic_config_npars, int, 0444); | 54 | module_param(qlcnic_config_npars, int, 0444); |
| 55 | MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled"); | 55 | MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled"); |
| 56 | 56 | ||
| 57 | static int __devinit qlcnic_probe(struct pci_dev *pdev, | 57 | static int qlcnic_probe(struct pci_dev *pdev, |
| 58 | const struct pci_device_id *ent); | 58 | const struct pci_device_id *ent); |
| 59 | static void __devexit qlcnic_remove(struct pci_dev *pdev); | 59 | static void qlcnic_remove(struct pci_dev *pdev); |
| 60 | static int qlcnic_open(struct net_device *netdev); | 60 | static int qlcnic_open(struct net_device *netdev); |
| 61 | static int qlcnic_close(struct net_device *netdev); | 61 | static int qlcnic_close(struct net_device *netdev); |
| 62 | static void qlcnic_tx_timeout(struct net_device *netdev); | 62 | static void qlcnic_tx_timeout(struct net_device *netdev); |
| @@ -1454,7 +1454,7 @@ qlcnic_alloc_msix_entries(struct qlcnic_adapter *adapter, u16 count) | |||
| 1454 | return -ENOMEM; | 1454 | return -ENOMEM; |
| 1455 | } | 1455 | } |
| 1456 | 1456 | ||
| 1457 | static int __devinit | 1457 | static int |
| 1458 | qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 1458 | qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
| 1459 | { | 1459 | { |
| 1460 | struct net_device *netdev = NULL; | 1460 | struct net_device *netdev = NULL; |
| @@ -1618,7 +1618,7 @@ err_out_maintenance_mode: | |||
| 1618 | return 0; | 1618 | return 0; |
| 1619 | } | 1619 | } |
| 1620 | 1620 | ||
| 1621 | static void __devexit qlcnic_remove(struct pci_dev *pdev) | 1621 | static void qlcnic_remove(struct pci_dev *pdev) |
| 1622 | { | 1622 | { |
| 1623 | struct qlcnic_adapter *adapter; | 1623 | struct qlcnic_adapter *adapter; |
| 1624 | struct net_device *netdev; | 1624 | struct net_device *netdev; |
| @@ -2928,7 +2928,7 @@ static struct pci_driver qlcnic_driver = { | |||
| 2928 | .name = qlcnic_driver_name, | 2928 | .name = qlcnic_driver_name, |
| 2929 | .id_table = qlcnic_pci_tbl, | 2929 | .id_table = qlcnic_pci_tbl, |
| 2930 | .probe = qlcnic_probe, | 2930 | .probe = qlcnic_probe, |
| 2931 | .remove = __devexit_p(qlcnic_remove), | 2931 | .remove = qlcnic_remove, |
| 2932 | #ifdef CONFIG_PM | 2932 | #ifdef CONFIG_PM |
| 2933 | .suspend = qlcnic_suspend, | 2933 | .suspend = qlcnic_suspend, |
| 2934 | .resume = qlcnic_resume, | 2934 | .resume = qlcnic_resume, |