3 files changed, 3 insertions, 16 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 1645f59648f0..973dbb7938c3 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -5524,14 +5524,8 @@ static int adap_init0(struct adapter *adap)
         struct fw_caps_config_cmd caps_cmd;
         int reset = 1;
 
-        /*
-         * Contact FW, advertising Master capability (and potentially forcing
-         * ourselves as the Master PF if our module parameter force_init is
-         * set).
-         */
-        ret = t4_fw_hello(adap, adap->mbox, adap->fn,
-                          force_init ? MASTER_MUST : MASTER_MAY,
-                          &state);
+        /* Contact FW, advertising Master capability */
+        ret = t4_fw_hello(adap, adap->mbox, adap->mbox, MASTER_MAY, &state);
         if (ret < 0) {
                 dev_err(adap->pdev_dev, "could not connect to FW, error %d\n",
                         ret);
@@ -5539,8 +5533,6 @@ static int adap_init0(struct adapter *adap)
         }
         if (ret == adap->mbox)
                 adap->flags |= MASTER_PF;
-        if (force_init && state == DEV_STATE_INIT)
-                state = DEV_STATE_UNINIT;
 
         /*
          * If we're the Master PF Driver and the device is uninitialized,
diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c
index 1e4c4ee9e11e..9ab997e18b20 100644
--- a/drivers/scsi/csiostor/csio_hw.c
+++ b/drivers/scsi/csiostor/csio_hw.c
@@ -47,7 +47,6 @@
 #include "csio_lnode.h"
 #include "csio_rnode.h"
 
-int csio_force_master;
 int csio_dbg_level = 0xFEFF;
 unsigned int csio_port_mask = 0xf;
 
@@ -889,7 +888,6 @@ csio_do_hello(struct csio_hw *hw, enum csio_dev_state *state)
 {
         struct csio_mb  *mbp;
         int     rv = 0;
-        enum csio_dev_master master;
         enum fw_retval retval;
         uint8_t mpfn;
         char state_str[16];
@@ -904,11 +902,9 @@ csio_do_hello(struct csio_hw *hw, enum csio_dev_state *state)
                 goto out;
         }
 
-        master = csio_force_master ? CSIO_MASTER_MUST : CSIO_MASTER_MAY;
-
 retry:
         csio_mb_hello(hw, mbp, CSIO_MB_DEFAULT_TMO, hw->pfn,
-                      hw->pfn, master, NULL);
+                      hw->pfn, CSIO_MASTER_MAY, NULL);
 
         rv = csio_mb_issue(hw, mbp);
         if (rv) {
diff --git a/drivers/scsi/csiostor/csio_hw.h b/drivers/scsi/csiostor/csio_hw.h
index 5db2d85195b1..68248da1b9af 100644
--- a/drivers/scsi/csiostor/csio_hw.h
+++ b/drivers/scsi/csiostor/csio_hw.h
@@ -110,7 +110,6 @@ struct csio_scsi_cpu_info {
 };
 
 extern int csio_dbg_level;
-extern int csio_force_master;
 extern unsigned int csio_port_mask;
 extern int csio_msi;