From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04199C63777 for ; Tue, 24 Nov 2020 03:34:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A667620872 for ; Tue, 24 Nov 2020 03:34:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729136AbgKXDdy (ORCPT ); Mon, 23 Nov 2020 22:33:54 -0500 Received: from out30-56.freemail.mail.aliyun.com ([115.124.30.56]:36537 "EHLO out30-56.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727161AbgKXDdx (ORCPT ); Mon, 23 Nov 2020 22:33:53 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04426;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0UGN.XXZ_1606188830; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0UGN.XXZ_1606188830) by smtp.aliyun-inc.com(127.0.0.1); Tue, 24 Nov 2020 11:33:50 +0800 From: Baolin Wang To: axboe@kernel.dk, tj@kernel.org Cc: baolin.wang@linux.alibaba.com, baolin.wang7@gmail.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] blk-iocost: Just open code the q_name() Date: Tue, 24 Nov 2020 11:33:32 +0800 Message-Id: <3bdc9526ac839a6952db8cd50cf0e75280614b1d.1606186717.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 ""; -} -static const char __maybe_unused *ioc_name(struct ioc *ioc) -{ - return q_name(ioc->rqos.q); + return ""; } static struct ioc_gq *pd_to_iocg(struct blkg_policy_data *pd) -- 1.8.3.1