enum dev_cmd_type cmd_type, int timeout)
 {
        struct request_queue *q = hba->cmd_queue;
+       DECLARE_COMPLETION_ONSTACK(wait);
        struct request *req;
        struct ufshcd_lrb *lrbp;
        int err;
        int tag;
-       struct completion wait;
 
        down_read(&hba->clk_scaling_lock);
 
                goto out;
        }
 
-       init_completion(&wait);
        lrbp = &hba->lrb[tag];
        WARN_ON(lrbp->cmd);
        err = ufshcd_compose_dev_cmd(hba, lrbp, cmd_type, tag);
  */
 static int ufshcd_uic_pwr_ctrl(struct ufs_hba *hba, struct uic_command *cmd)
 {
-       struct completion uic_async_done;
+       DECLARE_COMPLETION_ONSTACK(uic_async_done);
        unsigned long flags;
        u8 status;
        int ret;
        bool reenable_intr = false;
 
        mutex_lock(&hba->uic_cmd_mutex);
-       init_completion(&uic_async_done);
        ufshcd_add_delay_before_dme_cmd(hba);
 
        spin_lock_irqsave(hba->host->host_lock, flags);
                                        enum query_opcode desc_op)
 {
        struct request_queue *q = hba->cmd_queue;
+       DECLARE_COMPLETION_ONSTACK(wait);
        struct request *req;
        struct ufshcd_lrb *lrbp;
        int err = 0;
        int tag;
-       struct completion wait;
        u8 upiu_flags;
 
        down_read(&hba->clk_scaling_lock);
                goto out;
        }
 
-       init_completion(&wait);
        lrbp = &hba->lrb[tag];
        WARN_ON(lrbp->cmd);
        lrbp->cmd = NULL;