The simple q_name() function is only called from ioc_name(),
just open code it to make code more readable.
Signed-off-by: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx>
---
block/blk-iocost.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 103ccbd..089f3fe 100644
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -665,17 +665,14 @@ static struct ioc *q_to_ioc(struct request_queue *q)
return rqos_to_ioc(rq_qos_id(q, RQ_QOS_COST));
}
-static const char *q_name(struct request_queue *q)
+static const char __maybe_unused *ioc_name(struct ioc *ioc)
{
+ struct request_queue *q = ioc->rqos.q;
+
if (blk_queue_registered(q))
return kobject_name(q->kobj.parent);
- else
- return "<unknown>";
-}
-static const char __maybe_unused *ioc_name(struct ioc *ioc)
-{
- return q_name(ioc->rqos.q);
+ return "<unknown>";
}
static struct ioc_gq *pd_to_iocg(struct blkg_policy_data *pd)
--
1.8.3.1
