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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 75C69C4320A for ; Tue, 10 Aug 2021 19:27:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 54D4860F94 for ; Tue, 10 Aug 2021 19:27:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232978AbhHJT2C (ORCPT ); Tue, 10 Aug 2021 15:28:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232761AbhHJT1f (ORCPT ); Tue, 10 Aug 2021 15:27:35 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E144C0613D3 for ; Tue, 10 Aug 2021 12:27:13 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id h1so380773iol.9 for ; Tue, 10 Aug 2021 12:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MR4KCI2yYpZ9otoweP9rpmQowf+z82KBy/Idz2Qlj/0=; b=mefo2O63gy+ObFFjRU56/Lf4YYjX7qPvTBcZFAFkrC0V6Lg2lTrXRZFlioULpqQrhL TRJJ0/ksQUy11b+fvz8hzUmH0viq0CoTjXp/hbLUmvI/Ckf451vL0suUHJLbcA1bEJZC GIz+Er0hnAxKR1+HcBp/Sfm6mn/8RMR7PBanazy52m7yCw2aDW4rnGkMzTm6Da2otcVK oFymNzFpcB/Ty+mdrMOW5YUtGfYSePXXdk5+iwYABV/giHCq4aY9QzEKkV136VBGR0wk tfgAW6fNPtTr1wYFP+B97a+dL3xZ2oncoLXYgBuj9YpjLVvUFPsM9+ZPn+cjGiKFuC1X xzIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MR4KCI2yYpZ9otoweP9rpmQowf+z82KBy/Idz2Qlj/0=; b=r84VH41Z7HJiWT4nc6D82hbKQwNHTl5DYeDQtM/1KIKL8Y5ts5x0en+GD/t96oYzlp eReO3u2nXaWGVJPKZ9OVdQ7HyzBSRTFvh5JGZSc844SmLABVMzUa+yz44YjH8bhw63gt CSbJwZh9gpNBhBkqOzJkPC5rLiXWQnzkwBx0Yhx7GEAsm8dlhumlmhnCOYtrAdh3fnIh KioWK2RUUirQUMtsa+623CgBCCGB4YqzsIQvcDEwzeGWhnuS7/NNzqbfZ0al2espsjXJ IAnRIo60W1xIa/Qje6kZKvCJ7clvc7dQy0EiC45PFmgzEOCDAnVUDCeZgNLmmXbnXTG7 FjLA== X-Gm-Message-State: AOAM5331BtlK4Dhn9+KrNdtfXFZDUVyNZ3uAqbSFdbgF+aaxZOC1W0ff ++IetOgzSFdFEN65NWfCwB5v5A== X-Google-Smtp-Source: ABdhPJxipRJzXvqCnOaqwebV0TK4ZIjAllrANcyjce4XYc/sl+qO44AQwVCAsUzk2Q7aUGrbzFGoBA== X-Received: by 2002:a5d:91c2:: with SMTP id k2mr56591ior.117.1628623632939; Tue, 10 Aug 2021 12:27:12 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id c5sm3025356ioz.25.2021.08.10.12.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 12:27:12 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 7/7] net: ipa: kill ipa_clock_get_additional() Date: Tue, 10 Aug 2021 14:27:04 -0500 Message-Id: <20210810192704.2476461-8-elder@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210810192704.2476461-1-elder@linaro.org> References: <20210810192704.2476461-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that ipa_clock_get_additional() is a trivial wrapper around pm_runtime_get_if_active(), just open-code it in its only caller and delete the function. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_clock.c | 9 --------- drivers/net/ipa/ipa_clock.h | 10 ---------- drivers/net/ipa/ipa_smp2p.c | 5 ++++- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/drivers/net/ipa/ipa_clock.c b/drivers/net/ipa/ipa_clock.c index ab6626c617b91..6df66c574d594 100644 --- a/drivers/net/ipa/ipa_clock.c +++ b/drivers/net/ipa/ipa_clock.c @@ -264,15 +264,6 @@ static int ipa_runtime_idle(struct device *dev) return -EAGAIN; } -/* Get an IPA clock reference, but only if the reference count is - * already non-zero. Returns true if the additional reference was - * added successfully, or false otherwise. - */ -bool ipa_clock_get_additional(struct ipa *ipa) -{ - return pm_runtime_get_if_active(&ipa->pdev->dev, true) > 0; -} - /* Get an IPA clock reference. If the reference count is non-zero, it is * incremented and return is immediate. Otherwise the IPA clock is * enabled. diff --git a/drivers/net/ipa/ipa_clock.h b/drivers/net/ipa/ipa_clock.h index 8692c0d98bd1c..5c118f2c42e7a 100644 --- a/drivers/net/ipa/ipa_clock.h +++ b/drivers/net/ipa/ipa_clock.h @@ -62,16 +62,6 @@ void ipa_clock_exit(struct ipa_clock *clock); */ int ipa_clock_get(struct ipa *ipa); -/** - * ipa_clock_get_additional() - Get an IPA clock reference if not first - * @ipa: IPA pointer - * - * Return: true if reference taken, false otherwise - * - * This returns immediately, and only takes a reference if not the first - */ -bool ipa_clock_get_additional(struct ipa *ipa); - /** * ipa_clock_put() - Drop an IPA clock reference * @ipa: IPA pointer diff --git a/drivers/net/ipa/ipa_smp2p.c b/drivers/net/ipa/ipa_smp2p.c index f84d6523636e3..04b977cf91593 100644 --- a/drivers/net/ipa/ipa_smp2p.c +++ b/drivers/net/ipa/ipa_smp2p.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -84,13 +85,15 @@ struct ipa_smp2p { */ static void ipa_smp2p_notify(struct ipa_smp2p *smp2p) { + struct device *dev; u32 value; u32 mask; if (smp2p->notified) return; - smp2p->clock_on = ipa_clock_get_additional(smp2p->ipa); + dev = &smp2p->ipa->pdev->dev; + smp2p->clock_on = pm_runtime_get_if_active(dev, true) > 0; /* Signal whether the clock is enabled */ mask = BIT(smp2p->enabled_bit); -- 2.27.0