bus: mhi: Make mhi_state_str[] array static inline and move to common.h

mhi_state_str[] array could be used by MHI endpoint stack also. So let's
make the array as "static inline function" and move it inside the
"common.h" header so that the endpoint stack could also make use of it.

Reviewed-by: Hemant Kumar <hemantk@codeaurora.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20220301160308.107452-11-manivannan.sadhasivam@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/bus/mhi/common.h b/drivers/bus/mhi/common.h
index f2690bf11c99525aa14e86cea8a496bbb2b2df3c..b4ef9acd3ce7fe7d2012ff4a4b9d5245c5cf45fc 100644 (file)
--- a/drivers/bus/mhi/common.h
+++ b/drivers/bus/mhi/common.h
@@ -275,9 +275,30 @@ struct mhi_ring_element {
        __le32 dword[2];
 };
 
-extern const char * const mhi_state_str[MHI_STATE_MAX];
-#define TO_MHI_STATE_STR(state) ((state >= MHI_STATE_MAX || \
-                                 !mhi_state_str[state]) ? \
-                               "INVALID_STATE" : mhi_state_str[state])
+static inline const char *mhi_state_str(enum mhi_state state)
+{
+       switch (state) {
+       case MHI_STATE_RESET:
+               return "RESET";
+       case MHI_STATE_READY:
+               return "READY";
+       case MHI_STATE_M0:
+               return "M0";
+       case MHI_STATE_M1:
+               return "M1";
+       case MHI_STATE_M2:
+               return "M2";
+       case MHI_STATE_M3:
+               return "M3";
+       case MHI_STATE_M3_FAST:
+               return "M3 FAST";
+       case MHI_STATE_BHI:
+               return "BHI";
+       case MHI_STATE_SYS_ERR:
+               return "SYS ERROR";
+       default:
+               return "Unknown state";
+       }
+};
 
 #endif /* _MHI_COMMON_H */

diff --git a/drivers/bus/mhi/host/boot.c b/drivers/bus/mhi/host/boot.c
index d5ba3c7efb61a3e834bf4d1b5b28070357786c3d..b0da7ca4519c78040b80d22f3ad6536cfabc7f22 100644 (file)
--- a/drivers/bus/mhi/host/boot.c
+++ b/drivers/bus/mhi/host/boot.c
@@ -67,7 +67,7 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl)
 
        dev_dbg(dev, "Entered with pm_state:%s dev_state:%s ee:%s\n",
                to_mhi_pm_state_str(mhi_cntrl->pm_state),
-               TO_MHI_STATE_STR(mhi_cntrl->dev_state),
+               mhi_state_str(mhi_cntrl->dev_state),
                TO_MHI_EXEC_STR(mhi_cntrl->ee));
 
        /*

diff --git a/drivers/bus/mhi/host/debugfs.c b/drivers/bus/mhi/host/debugfs.c
index bdc875d7bd4dc21c6a8f30878c6a58860b8c555a..cfec7811dfbbdd2e5f4a3c1f7fb87d561e7b37c6 100644 (file)
--- a/drivers/bus/mhi/host/debugfs.c
+++ b/drivers/bus/mhi/host/debugfs.c
@@ -20,7 +20,7 @@ static int mhi_debugfs_states_show(struct seq_file *m, void *d)
        seq_printf(m, "PM state: %s Device: %s MHI state: %s EE: %s wake: %s\n",
                   to_mhi_pm_state_str(mhi_cntrl->pm_state),
                   mhi_is_active(mhi_cntrl) ? "Active" : "Inactive",
-                  TO_MHI_STATE_STR(mhi_cntrl->dev_state),
+                  mhi_state_str(mhi_cntrl->dev_state),
                   TO_MHI_EXEC_STR(mhi_cntrl->ee),
                   mhi_cntrl->wake_set ? "true" : "false");
 
@@ -206,13 +206,13 @@ static int mhi_debugfs_regdump_show(struct seq_file *m, void *d)
 
        seq_printf(m, "Host PM state: %s Device state: %s EE: %s\n",
                   to_mhi_pm_state_str(mhi_cntrl->pm_state),
-                  TO_MHI_STATE_STR(mhi_cntrl->dev_state),
+                  mhi_state_str(mhi_cntrl->dev_state),
                   TO_MHI_EXEC_STR(mhi_cntrl->ee));
 
        state = mhi_get_mhi_state(mhi_cntrl);
        ee = mhi_get_exec_env(mhi_cntrl);
        seq_printf(m, "Device EE: %s state: %s\n", TO_MHI_EXEC_STR(ee),
-                  TO_MHI_STATE_STR(state));
+                  mhi_state_str(state));
 
        for (i = 0; regs[i].name; i++) {
                if (!regs[i].base)

diff --git a/drivers/bus/mhi/host/init.c b/drivers/bus/mhi/host/init.c
index 016dcc35db80eef1eec7811d0a393356d379053e..a665b8e92408f049b13cbdf85b3d8140c39c11a9 100644 (file)
--- a/drivers/bus/mhi/host/init.c
+++ b/drivers/bus/mhi/host/init.c
@@ -45,18 +45,6 @@ const char * const dev_state_tran_str[DEV_ST_TRANSITION_MAX] = {
        [DEV_ST_TRANSITION_DISABLE] = "DISABLE",
 };
 
-const char * const mhi_state_str[MHI_STATE_MAX] = {
-       [MHI_STATE_RESET] = "RESET",
-       [MHI_STATE_READY] = "READY",
-       [MHI_STATE_M0] = "M0",
-       [MHI_STATE_M1] = "M1",
-       [MHI_STATE_M2] = "M2",
-       [MHI_STATE_M3] = "M3",
-       [MHI_STATE_M3_FAST] = "M3 FAST",
-       [MHI_STATE_BHI] = "BHI",
-       [MHI_STATE_SYS_ERR] = "SYS ERROR",
-};
-
 const char * const mhi_ch_state_type_str[MHI_CH_STATE_TYPE_MAX] = {
        [MHI_CH_STATE_TYPE_RESET] = "RESET",
        [MHI_CH_STATE_TYPE_STOP] = "STOP",

diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
index dabf85b92a849ee752cb4da53903f01b815d0fb4..9021be7f23597a2dd1cc8ca07226c82dee959d0f 100644 (file)
--- a/drivers/bus/mhi/host/main.c
+++ b/drivers/bus/mhi/host/main.c
@@ -477,8 +477,8 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv)
        ee = mhi_get_exec_env(mhi_cntrl);
        dev_dbg(dev, "local ee: %s state: %s device ee: %s state: %s\n",
                TO_MHI_EXEC_STR(mhi_cntrl->ee),
-               TO_MHI_STATE_STR(mhi_cntrl->dev_state),
-               TO_MHI_EXEC_STR(ee), TO_MHI_STATE_STR(state));
+               mhi_state_str(mhi_cntrl->dev_state),
+               TO_MHI_EXEC_STR(ee), mhi_state_str(state));
 
        if (state == MHI_STATE_SYS_ERR) {
                dev_dbg(dev, "System error detected\n");
@@ -844,7 +844,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl,
                        new_state = MHI_TRE_GET_EV_STATE(local_rp);
 
                        dev_dbg(dev, "State change event to state: %s\n",
-                               TO_MHI_STATE_STR(new_state));
+                               mhi_state_str(new_state));
 
                        switch (new_state) {
                        case MHI_STATE_M0:
@@ -871,7 +871,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl,
                        }
                        default:
                                dev_err(dev, "Invalid state: %s\n",
-                                       TO_MHI_STATE_STR(new_state));
+                                       mhi_state_str(new_state));
                        }
 
                        break;

diff --git a/drivers/bus/mhi/host/pm.c b/drivers/bus/mhi/host/pm.c
index bb8a23e80e19369823a7a7af670fb49cbbe0f2c2..3d90b8ecd3d923345069aebbe8ee774300d21d58 100644 (file)
--- a/drivers/bus/mhi/host/pm.c
+++ b/drivers/bus/mhi/host/pm.c
@@ -541,7 +541,7 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl)
 
        dev_dbg(dev, "Exiting with PM state: %s, MHI state: %s\n",
                to_mhi_pm_state_str(mhi_cntrl->pm_state),
-               TO_MHI_STATE_STR(mhi_cntrl->dev_state));
+               mhi_state_str(mhi_cntrl->dev_state));
 
        mutex_unlock(&mhi_cntrl->pm_mutex);
 }
@@ -684,7 +684,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl)
 exit_sys_error_transition:
        dev_dbg(dev, "Exiting with PM state: %s, MHI state: %s\n",
                to_mhi_pm_state_str(mhi_cntrl->pm_state),
-               TO_MHI_STATE_STR(mhi_cntrl->dev_state));
+               mhi_state_str(mhi_cntrl->dev_state));
 
        mutex_unlock(&mhi_cntrl->pm_mutex);
 }
@@ -859,7 +859,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl)
        if (!ret || MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) {
                dev_err(dev,
                        "Did not enter M3 state, MHI state: %s, PM state: %s\n",
-                       TO_MHI_STATE_STR(mhi_cntrl->dev_state),
+                       mhi_state_str(mhi_cntrl->dev_state),
                        to_mhi_pm_state_str(mhi_cntrl->pm_state));
                return -EIO;
        }
@@ -885,7 +885,7 @@ static int __mhi_pm_resume(struct mhi_controller *mhi_cntrl, bool force)
 
        dev_dbg(dev, "Entered with PM state: %s, MHI state: %s\n",
                to_mhi_pm_state_str(mhi_cntrl->pm_state),
-               TO_MHI_STATE_STR(mhi_cntrl->dev_state));
+               mhi_state_str(mhi_cntrl->dev_state));
 
        if (mhi_cntrl->pm_state == MHI_PM_DISABLE)
                return 0;
@@ -895,7 +895,7 @@ static int __mhi_pm_resume(struct mhi_controller *mhi_cntrl, bool force)
 
        if (mhi_get_mhi_state(mhi_cntrl) != MHI_STATE_M3) {
                dev_warn(dev, "Resuming from non M3 state (%s)\n",
-                        TO_MHI_STATE_STR(mhi_get_mhi_state(mhi_cntrl)));
+                        mhi_state_str(mhi_get_mhi_state(mhi_cntrl)));
                if (!force)
                        return -EINVAL;
        }
@@ -932,7 +932,7 @@ static int __mhi_pm_resume(struct mhi_controller *mhi_cntrl, bool force)
        if (!ret || MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) {
                dev_err(dev,
                        "Did not enter M0 state, MHI state: %s, PM state: %s\n",
-                       TO_MHI_STATE_STR(mhi_cntrl->dev_state),
+                       mhi_state_str(mhi_cntrl->dev_state),
                        to_mhi_pm_state_str(mhi_cntrl->pm_state));
                return -EIO;
        }
@@ -1083,7 +1083,7 @@ int mhi_async_power_up(struct mhi_controller *mhi_cntrl)
 
        state = mhi_get_mhi_state(mhi_cntrl);
        dev_dbg(dev, "Attempting power on with EE: %s, state: %s\n",
-               TO_MHI_EXEC_STR(current_ee), TO_MHI_STATE_STR(state));
+               TO_MHI_EXEC_STR(current_ee), mhi_state_str(state));
 
        if (state == MHI_STATE_SYS_ERR) {
                mhi_set_mhi_state(mhi_cntrl, MHI_STATE_RESET);