diff --git a/block/blk-core.c b/block/blk-core.c
index f0e28624ef9c8abe7c5d2592a5658cea3c25e8e6..2746db5f54d7355a53662064275418ea93f9a5e8 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -400,8 +400,7 @@ void blk_cleanup_queue(struct request_queue *q)
 	 * prevent that blk_mq_run_hw_queues() accesses the hardware queues
 	 * after draining finished.
 	 */
-	blk_freeze_queue_start(q);
-	blk_mq_freeze_queue_wait_sync(q);
+	blk_freeze_queue(q);
 
 	rq_qos_exit(q);
 
@@ -518,7 +517,6 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
 	struct request_queue *q =
 		container_of(ref, struct request_queue, q_usage_counter);
 
-	blk_queue_flag_set(QUEUE_FLAG_USAGE_COUNT_SYNC, q);
 	wake_up_all(&q->mq_freeze_wq);
 }
 
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e0ed97465b0f074ce3f5cbb9723e9949e9ae9ee8..5f8660ef8c37239335f58d961526fab55cfa9773 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -195,7 +195,6 @@ void blk_freeze_queue_start(struct request_queue *q)
 {
 	mutex_lock(&q->mq_freeze_lock);
 	if (++q->mq_freeze_depth == 1) {
-		blk_queue_flag_clear(QUEUE_FLAG_USAGE_COUNT_SYNC, q);
 		percpu_ref_kill(&q->q_usage_counter);
 		mutex_unlock(&q->mq_freeze_lock);
 		if (queue_is_mq(q))
@@ -206,12 +205,6 @@ void blk_freeze_queue_start(struct request_queue *q)
 }
 EXPORT_SYMBOL_GPL(blk_freeze_queue_start);
 
-void blk_mq_freeze_queue_wait_sync(struct request_queue *q)
-{
-	wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter) &&
-			test_bit(QUEUE_FLAG_USAGE_COUNT_SYNC, &q->queue_flags));
-}
-
 void blk_mq_freeze_queue_wait(struct request_queue *q)
 {
 	wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index f3d78b939e0145b6a79a2f61e57f2193af1b8750..2eca0b76b3e95736724d58329e0fd77a12de2c63 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -566,7 +566,6 @@ void blk_mq_freeze_queue(struct request_queue *q);
 void blk_mq_unfreeze_queue(struct request_queue *q);
 void blk_freeze_queue_start(struct request_queue *q);
 void blk_mq_freeze_queue_wait(struct request_queue *q);
-void blk_mq_freeze_queue_wait_sync(struct request_queue *q);
 int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,
 				     unsigned long timeout);
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index b04613bc3ed57092ac056f1380b30f0da5c58812..9ede0a81e46676b5f445726482e15ddc98d55cf7 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -643,8 +643,6 @@ struct request_queue {
 #define QUEUE_FLAG_NOWAIT       29	/* device supports NOWAIT */
 /*at least one blk-mq hctx can't get driver tag */
 #define QUEUE_FLAG_HCTX_WAIT	30
-/* sync for q_usage_counter */
-#define QUEUE_FLAG_USAGE_COUNT_SYNC    31
 
 #define QUEUE_FLAG_MQ_DEFAULT	((1 << QUEUE_FLAG_IO_STAT) |		\
 				 (1 << QUEUE_FLAG_SAME_COMP) |		\