bus: mhi: core: Fix shadow declarations

This commit fixes below sparse warnings with W=2 about shadow
declarations:

drivers/bus/mhi/core/main.c: In function ‘parse_xfer_event’:
drivers/bus/mhi/core/main.c:667:17: warning: declaration of ‘flags’ shadows a previous local [-Wshadow]
  667 |   unsigned long flags;
      |                 ^~~~~
drivers/bus/mhi/core/main.c:565:16: note: shadowed declaration is here
  565 |  unsigned long flags = 0;
      |                ^~~~~
drivers/bus/mhi/core/main.c: In function ‘mhi_process_ctrl_ev_ring’:
drivers/bus/mhi/core/main.c:856:23: warning: declaration of ‘new_state’ shadows a previous local [-Wshadow]
  856 |     enum mhi_pm_state new_state;
      |                       ^~~~~~~~~
drivers/bus/mhi/core/main.c:837:19: note: shadowed declaration is here
  837 |    enum mhi_state new_state;
      |                   ^~~~~~~~~

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
index b0c8afe..22acde1 100644 (file)
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -664,15 +664,15 @@ static int parse_xfer_event(struct mhi_controller *mhi_cntrl,
        case MHI_EV_CC_OOB:
        case MHI_EV_CC_DB_MODE:
        {
-               unsigned long flags;
+               unsigned long pm_lock_flags;
 
                mhi_chan->db_cfg.db_mode = 1;
-               read_lock_irqsave(&mhi_cntrl->pm_lock, flags);
+               read_lock_irqsave(&mhi_cntrl->pm_lock, pm_lock_flags);
                if (tre_ring->wp != tre_ring->rp &&
                    MHI_DB_ACCESS_VALID(mhi_cntrl)) {
                        mhi_ring_chan_db(mhi_cntrl, mhi_chan);
                }
-               read_unlock_irqrestore(&mhi_cntrl->pm_lock, flags);
+               read_unlock_irqrestore(&mhi_cntrl->pm_lock, pm_lock_flags);
                break;
        }
        case MHI_EV_CC_BAD_TRE:
@@ -853,14 +853,14 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl,
                                break;
                        case MHI_STATE_SYS_ERR:
                        {
-                               enum mhi_pm_state new_state;
+                               enum mhi_pm_state pm_state;
 
                                dev_dbg(dev, "System error detected\n");
                                write_lock_irq(&mhi_cntrl->pm_lock);
-                               new_state = mhi_tryset_pm_state(mhi_cntrl,
+                               pm_state = mhi_tryset_pm_state(mhi_cntrl,
                                                        MHI_PM_SYS_ERR_DETECT);
                                write_unlock_irq(&mhi_cntrl->pm_lock);
-                               if (new_state == MHI_PM_SYS_ERR_DETECT)
+                               if (pm_state == MHI_PM_SYS_ERR_DETECT)
                                        mhi_pm_sys_err_handler(mhi_cntrl);
                                break;
                        }