qlcnic: fix checks for auto_fw_reset

o Remove checks of 1 for auto_fw_reset module parameter.
  auto_fw_reset is of type int and can have value > 1.
o Remove unnecessary #define for 1

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 44e316fd67b..fa7f794de29 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -867,7 +867,6 @@ struct qlcnic_nic_intr_coalesce {
 #define LINKEVENT_LINKSPEED_MBPS        0
 #define LINKEVENT_LINKSPEED_ENCODED     1
 
-#define AUTO_FW_RESET_ENABLED   0x01
 /* firmware response header:
  *      63:58 - message type
  *      57:56 - owner
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 37c04b4fade..4994b947fd2 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -42,7 +42,7 @@ static int use_msi_x = 1;
 module_param(use_msi_x, int, 0444);
 MODULE_PARM_DESC(use_msi_x, "MSI-X interrupt (0=disabled, 1=enabled");
 
-static int auto_fw_reset = AUTO_FW_RESET_ENABLED;
+static int auto_fw_reset = 1;
 module_param(auto_fw_reset, int, 0644);
 MODULE_PARM_DESC(auto_fw_reset, "Auto firmware reset (0=disabled, 1=enabled");
 
@@ -2959,8 +2959,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
                 if (adapter->need_fw_reset)
                         goto detach;
 
-                if (adapter->reset_context &&
-                    auto_fw_reset == AUTO_FW_RESET_ENABLED) {
+                if (adapter->reset_context && auto_fw_reset) {
                         qlcnic_reset_hw_context(adapter);
                         adapter->netdev->trans_start = jiffies;
                 }
@@ -2973,7 +2972,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter)
 
         qlcnic_dev_request_reset(adapter);
 
-        if ((auto_fw_reset == AUTO_FW_RESET_ENABLED))
+        if (auto_fw_reset)
                 clear_bit(__QLCNIC_FW_ATTACHED, &adapter->state);
 
         dev_info(&netdev->dev, "firmware hang detected\n");
@@ -2982,7 +2981,7 @@ detach:
         adapter->dev_state = (state == QLCNIC_DEV_NEED_QUISCENT) ? state :
                 QLCNIC_DEV_NEED_RESET;
 
-        if ((auto_fw_reset == AUTO_FW_RESET_ENABLED) &&
+        if (auto_fw_reset &&
                 !test_and_set_bit(__QLCNIC_RESETTING, &adapter->state)) {
 
                 qlcnic_schedule_work(adapter, qlcnic_detach_work, 0);