Commit 099f7aa7 authored by Sony Chacko's avatar Sony Chacko Committed by David S. Miller

qlcnic: rename module params with module_param_named

Add qlcnic prefix to qlcnic driver module parameters.
Signed-off-by: default avatarSony Chacko <sony.chacko@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5796bd04
...@@ -34,21 +34,21 @@ static int qlcnic_mac_learn; ...@@ -34,21 +34,21 @@ static int qlcnic_mac_learn;
module_param(qlcnic_mac_learn, int, 0444); module_param(qlcnic_mac_learn, int, 0444);
MODULE_PARM_DESC(qlcnic_mac_learn, "Mac Filter (0=disabled, 1=enabled)"); MODULE_PARM_DESC(qlcnic_mac_learn, "Mac Filter (0=disabled, 1=enabled)");
static int use_msi = 1; static int qlcnic_use_msi = 1;
module_param(use_msi, int, 0444);
MODULE_PARM_DESC(use_msi, "MSI interrupt (0=disabled, 1=enabled"); MODULE_PARM_DESC(use_msi, "MSI interrupt (0=disabled, 1=enabled");
module_param_named(use_msi, qlcnic_use_msi, int, 0444);
static int use_msi_x = 1; static int qlcnic_use_msi_x = 1;
module_param(use_msi_x, int, 0444);
MODULE_PARM_DESC(use_msi_x, "MSI-X interrupt (0=disabled, 1=enabled"); MODULE_PARM_DESC(use_msi_x, "MSI-X interrupt (0=disabled, 1=enabled");
module_param_named(use_msi_x, qlcnic_use_msi_x, int, 0444);
static int auto_fw_reset = 1; static int qlcnic_auto_fw_reset = 1;
module_param(auto_fw_reset, int, 0644);
MODULE_PARM_DESC(auto_fw_reset, "Auto firmware reset (0=disabled, 1=enabled"); MODULE_PARM_DESC(auto_fw_reset, "Auto firmware reset (0=disabled, 1=enabled");
module_param_named(auto_fw_reset, qlcnic_auto_fw_reset, int, 0644);
static int load_fw_file; static int qlcnic_load_fw_file;
module_param(load_fw_file, int, 0444);
MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file"); MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file");
module_param_named(load_fw_file, qlcnic_load_fw_file, int, 0444);
static int qlcnic_config_npars; static int qlcnic_config_npars;
module_param(qlcnic_config_npars, int, 0444); module_param(qlcnic_config_npars, int, 0444);
...@@ -317,7 +317,7 @@ static void qlcnic_enable_msi_legacy(struct qlcnic_adapter *adapter) ...@@ -317,7 +317,7 @@ static void qlcnic_enable_msi_legacy(struct qlcnic_adapter *adapter)
struct qlcnic_hardware_context *ahw = adapter->ahw; struct qlcnic_hardware_context *ahw = adapter->ahw;
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
if (use_msi && !pci_enable_msi(pdev)) { if (qlcnic_use_msi && !pci_enable_msi(pdev)) {
adapter->flags |= QLCNIC_MSI_ENABLED; adapter->flags |= QLCNIC_MSI_ENABLED;
offset = msi_tgt_status[adapter->ahw->pci_func]; offset = msi_tgt_status[adapter->ahw->pci_func];
adapter->tgt_status_reg = qlcnic_get_ioaddr(adapter->ahw, adapter->tgt_status_reg = qlcnic_get_ioaddr(adapter->ahw,
...@@ -631,7 +631,7 @@ qlcnic_check_options(struct qlcnic_adapter *adapter) ...@@ -631,7 +631,7 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
adapter->max_rxd = MAX_RCV_DESCRIPTORS_1G; adapter->max_rxd = MAX_RCV_DESCRIPTORS_1G;
} }
adapter->ahw->msix_supported = !!use_msi_x; adapter->ahw->msix_supported = !!qlcnic_use_msi_x;
adapter->num_txd = MAX_CMD_DESCRIPTORS; adapter->num_txd = MAX_CMD_DESCRIPTORS;
...@@ -961,7 +961,7 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter) ...@@ -961,7 +961,7 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
else if (!err) else if (!err)
goto check_fw_status; goto check_fw_status;
if (load_fw_file) if (qlcnic_load_fw_file)
qlcnic_request_firmware(adapter); qlcnic_request_firmware(adapter);
else { else {
err = qlcnic_check_flash_fw_ver(adapter); err = qlcnic_check_flash_fw_ver(adapter);
...@@ -2558,7 +2558,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) ...@@ -2558,7 +2558,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
if (adapter->need_fw_reset) if (adapter->need_fw_reset)
goto detach; goto detach;
if (adapter->ahw->reset_context && auto_fw_reset) { if (adapter->ahw->reset_context && qlcnic_auto_fw_reset) {
qlcnic_reset_hw_context(adapter); qlcnic_reset_hw_context(adapter);
adapter->netdev->trans_start = jiffies; adapter->netdev->trans_start = jiffies;
} }
...@@ -2573,7 +2573,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) ...@@ -2573,7 +2573,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
qlcnic_dev_request_reset(adapter); qlcnic_dev_request_reset(adapter);
if (auto_fw_reset) if (qlcnic_auto_fw_reset)
clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state); clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
dev_err(&adapter->pdev->dev, "firmware hang detected\n"); dev_err(&adapter->pdev->dev, "firmware hang detected\n");
...@@ -2598,8 +2598,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) ...@@ -2598,8 +2598,8 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
adapter->dev_state = (state == QLCNIC_DEV_NEED_QUISCENT) ? state : adapter->dev_state = (state == QLCNIC_DEV_NEED_QUISCENT) ? state :
QLCNIC_DEV_NEED_RESET; QLCNIC_DEV_NEED_RESET;
if (auto_fw_reset && if (qlcnic_auto_fw_reset && !test_and_set_bit(__QLCNIC_RESETTING,
!test_and_set_bit(__QLCNIC_RESETTING, &adapter->state)) { &adapter->state)) {
qlcnic_schedule_work(adapter, qlcnic_detach_work, 0); qlcnic_schedule_work(adapter, qlcnic_detach_work, 0);
QLCDB(adapter, DRV, "fw recovery scheduled.\n"); QLCDB(adapter, DRV, "fw recovery scheduled.\n");
...@@ -2784,7 +2784,7 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter) ...@@ -2784,7 +2784,7 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter)
int qlcnic_validate_max_rss(struct net_device *netdev, u8 max_hw, u8 val) int qlcnic_validate_max_rss(struct net_device *netdev, u8 max_hw, u8 val)
{ {
if (!use_msi_x && !use_msi) { if (!qlcnic_use_msi_x && !qlcnic_use_msi) {
netdev_info(netdev, "no msix or msi support, hence no rss\n"); netdev_info(netdev, "no msix or msi support, hence no rss\n");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment