};
 
 #define ufshcd_set_eh_in_progress(h) \
-       (h->eh_flags |= UFSHCD_EH_IN_PROGRESS)
+       ((h)->eh_flags |= UFSHCD_EH_IN_PROGRESS)
 #define ufshcd_eh_in_progress(h) \
-       (h->eh_flags & UFSHCD_EH_IN_PROGRESS)
+       ((h)->eh_flags & UFSHCD_EH_IN_PROGRESS)
 #define ufshcd_clear_eh_in_progress(h) \
-       (h->eh_flags &= ~UFSHCD_EH_IN_PROGRESS)
+       ((h)->eh_flags &= ~UFSHCD_EH_IN_PROGRESS)
 
 #define ufshcd_set_ufs_dev_active(h) \
        ((h)->curr_dev_pwr_mode = UFS_ACTIVE_PWR_MODE)
                        break;
                }
                /*
-                * If we here, it means gating work is either done or
+                * If we are here, it means gating work is either done or
                 * currently running. Hence, fall through to cancel gating
                 * work and to enable clocks.
                 */