diff options
author | Sony Chacko <sony.chacko@qlogic.com> | 2012-12-03 22:33:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-04 13:00:12 -0500 |
commit | 099f7aa7400df0ffcc8d3c30dcde1ce0595d8a32 (patch) | |
tree | dae3748d69883b8459655b482f0ac5a59eb10923 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |
parent | 5796bd040e26915b05edf7b0e43eb4aa971170aa (diff) |
qlcnic: rename module params with module_param_named
Add qlcnic prefix to qlcnic driver module parameters.
Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 88084a3bec34..8d58092bd060 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -34,21 +34,21 @@ static int qlcnic_mac_learn; | |||
34 | module_param(qlcnic_mac_learn, int, 0444); | 34 | module_param(qlcnic_mac_learn, int, 0444); |
35 | MODULE_PARM_DESC(qlcnic_mac_learn, "Mac Filter (0=disabled, 1=enabled)"); | 35 | MODULE_PARM_DESC(qlcnic_mac_learn, "Mac Filter (0=disabled, 1=enabled)"); |
36 | 36 | ||
37 | static int use_msi = 1; | 37 | static int qlcnic_use_msi = 1; |
38 | module_param(use_msi, int, 0444); | ||
39 | MODULE_PARM_DESC(use_msi, "MSI interrupt (0=disabled, 1=enabled"); | 38 | MODULE_PARM_DESC(use_msi, "MSI interrupt (0=disabled, 1=enabled"); |
39 | module_param_named(use_msi, qlcnic_use_msi, int, 0444); | ||
40 | 40 | ||
41 | static int use_msi_x = 1; | 41 | static int qlcnic_use_msi_x = 1; |
42 | module_param(use_msi_x, int, 0444); | ||
43 | MODULE_PARM_DESC(use_msi_x, "MSI-X interrupt (0=disabled, 1=enabled"); | 42 | MODULE_PARM_DESC(use_msi_x, "MSI-X interrupt (0=disabled, 1=enabled"); |
43 | module_param_named(use_msi_x, qlcnic_use_msi_x, int, 0444); | ||
44 | 44 | ||
45 | static int auto_fw_reset = 1; | 45 | static int qlcnic_auto_fw_reset = 1; |
46 | module_param(auto_fw_reset, int, 0644); | ||
47 | MODULE_PARM_DESC(auto_fw_reset, "Auto firmware reset (0=disabled, 1=enabled"); | 46 | MODULE_PARM_DESC(auto_fw_reset, "Auto firmware reset (0=disabled, 1=enabled"); |
47 | module_param_named(auto_fw_reset, qlcnic_auto_fw_reset, int, 0644); | ||
48 | 48 | ||
49 | static int load_fw_file; | 49 | static int qlcnic_load_fw_file; |
50 | module_param(load_fw_file, int, 0444); | ||
51 | MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file"); | 50 | MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file"); |
51 | module_param_named(load_fw_file, qlcnic_load_fw_file, int, 0444); | ||
52 | 52 | ||
53 | static int qlcnic_config_npars; | 53 | static int qlcnic_config_npars; |
54 | module_param(qlcnic_config_npars, int, 0444); | 54 | module_param(qlcnic_config_npars, int, 0444); |
@@ -317,7 +317,7 @@ static void qlcnic_enable_msi_legacy(struct qlcnic_adapter *adapter) | |||
317 | struct qlcnic_hardware_context *ahw = adapter->ahw; | 317 | struct qlcnic_hardware_context *ahw = adapter->ahw; |
318 | struct pci_dev *pdev = adapter->pdev; | 318 | struct pci_dev *pdev = adapter->pdev; |
319 | 319 | ||
320 | if (use_msi && !pci_enable_msi(pdev)) { | 320 | if (qlcnic_use_msi && !pci_enable_msi(pdev)) { |
321 | adapter->flags |= QLCNIC_MSI_ENABLED; | 321 | adapter->flags |= QLCNIC_MSI_ENABLED; |
322 | offset = msi_tgt_status[adapter->ahw->pci_func]; | 322 | offset = msi_tgt_status[adapter->ahw->pci_func]; |
323 | adapter->tgt_status_reg = qlcnic_get_ioaddr(adapter->ahw, | 323 | adapter->tgt_status_reg = qlcnic_get_ioaddr(adapter->ahw, |
@@ -631,7 +631,7 @@ qlcnic_check_options(struct qlcnic_adapter *adapter) | |||
631 | adapter->max_rxd = MAX_RCV_DESCRIPTORS_1G; | 631 | adapter->max_rxd = MAX_RCV_DESCRIPTORS_1G; |
632 | } | 632 | } |
633 | 633 | ||
634 | adapter->ahw->msix_supported = !!use_msi_x; | 634 | adapter->ahw->msix_supported = !!qlcnic_use_msi_x; |
635 | 635 | ||
636 | adapter->num_txd = MAX_CMD_DESCRIPTORS; | 636 | adapter->num_txd = MAX_CMD_DESCRIPTORS; |
637 | 637 | ||
@@ -961,7 +961,7 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter) | |||
961 | else if (!err) | 961 | else if (!err) |
962 | goto check_fw_status; | 962 | goto check_fw_status; |
963 | 963 | ||
964 | if (load_fw_file) | 964 | if (qlcnic_load_fw_file) |
965 | qlcnic_request_firmware(adapter); | 965 | qlcnic_request_firmware(adapter); |
966 | else { | 966 | else { |
967 | err = qlcnic_check_flash_fw_ver(adapter); | 967 | err = qlcnic_check_flash_fw_ver(adapter); |
@@ -2558,7 +2558,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) | |||
2558 | if (adapter->need_fw_reset) | 2558 | if (adapter->need_fw_reset) |
2559 | goto detach; | 2559 | goto detach; |
2560 | 2560 | ||
2561 | if (adapter->ahw->reset_context && auto_fw_reset) { | 2561 | if (adapter->ahw->reset_context && qlcnic_auto_fw_reset) { |
2562 | qlcnic_reset_hw_context(adapter); | 2562 | qlcnic_reset_hw_context(adapter); |
2563 | adapter->netdev->trans_start = jiffies; | 2563 | adapter->netdev->trans_start = jiffies; |
2564 | } | 2564 | } |
@@ -2573,7 +2573,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) | |||
2573 | 2573 | ||
2574 | qlcnic_dev_request_reset(adapter); | 2574 | qlcnic_dev_request_reset(adapter); |
2575 | 2575 | ||
2576 | if (auto_fw_reset) | 2576 | if (qlcnic_auto_fw_reset) |
2577 | clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state); | 2577 | clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state); |
2578 | 2578 | ||
2579 | dev_err(&adapter->pdev->dev, "firmware hang detected\n"); | 2579 | dev_err(&adapter->pdev->dev, "firmware hang detected\n"); |
@@ -2598,8 +2598,8 @@ detach: | |||
2598 | adapter->dev_state = (state == QLCNIC_DEV_NEED_QUISCENT) ? state : | 2598 | adapter->dev_state = (state == QLCNIC_DEV_NEED_QUISCENT) ? state : |
2599 | QLCNIC_DEV_NEED_RESET; | 2599 | QLCNIC_DEV_NEED_RESET; |
2600 | 2600 | ||
2601 | if (auto_fw_reset && | 2601 | if (qlcnic_auto_fw_reset && !test_and_set_bit(__QLCNIC_RESETTING, |
2602 | !test_and_set_bit(__QLCNIC_RESETTING, &adapter->state)) { | 2602 | &adapter->state)) { |
2603 | 2603 | ||
2604 | qlcnic_schedule_work(adapter, qlcnic_detach_work, 0); | 2604 | qlcnic_schedule_work(adapter, qlcnic_detach_work, 0); |
2605 | QLCDB(adapter, DRV, "fw recovery scheduled.\n"); | 2605 | QLCDB(adapter, DRV, "fw recovery scheduled.\n"); |
@@ -2784,7 +2784,7 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter) | |||
2784 | 2784 | ||
2785 | int qlcnic_validate_max_rss(struct net_device *netdev, u8 max_hw, u8 val) | 2785 | int qlcnic_validate_max_rss(struct net_device *netdev, u8 max_hw, u8 val) |
2786 | { | 2786 | { |
2787 | if (!use_msi_x && !use_msi) { | 2787 | if (!qlcnic_use_msi_x && !qlcnic_use_msi) { |
2788 | netdev_info(netdev, "no msix or msi support, hence no rss\n"); | 2788 | netdev_info(netdev, "no msix or msi support, hence no rss\n"); |
2789 | return -EINVAL; | 2789 | return -EINVAL; |
2790 | } | 2790 | } |