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 97F70C433E0 for ; Wed, 10 Feb 2021 22:37:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6237364EBB for ; Wed, 10 Feb 2021 22:37:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233756AbhBJWgs (ORCPT ); Wed, 10 Feb 2021 17:36:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233708AbhBJWfv (ORCPT ); Wed, 10 Feb 2021 17:35:51 -0500 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C6B6C0617A9 for ; Wed, 10 Feb 2021 14:33:29 -0800 (PST) Received: by mail-io1-xd33.google.com with SMTP id m17so3698371ioy.4 for ; Wed, 10 Feb 2021 14:33:29 -0800 (PST) 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=7FCuQIhoM4UnSeDf+V9T1zVw5r1nx3mRIbuQj9L1BYA=; b=Rd/yJmUWl/CbjQMXYAj81h5dkBwFZoIiFyzebIXqmV6DFK9Qtj9EkWHVY3rV1A/GT+ jHv17UrnbOkI3wbe4ApcNKXs4L6No+EBJ2tsgAlQyV0Sjs9+OEo3aI2DT+AgD6duxV1H LtIwyRHbsl8CtEfljXn4SqVpgMWXIqksSyR4UEILQWBvKwZ+bOU/Xoj/w1w4g4px9nyU Tsh5RNdBhuIwN0AmjIgHkNLCyvZ4GcHuOljB2CAtkq8pvR4oIl9qVwVwooCLQoqT50aY BIhbNnmr6rVSvaDcLmfhFW9vIZImUVfEkjRsC2seur/r9ExLYkngZdpeYVGnp65WPNuZ EeNA== 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=7FCuQIhoM4UnSeDf+V9T1zVw5r1nx3mRIbuQj9L1BYA=; b=QNEHOAHBgeugk98RbeGcAqxSQGea/cF/s52LJJMPBKOkmV/Rf1JaYR8AV2d5K5qrur OIObZ3Y5RN5uf/PZ8coRz51Y98UzqNCXIS8SttqgarC6aOuoreTGSm5PT/kZeDNv5XuJ hn4v+Jc/X/UbVC5iyFm20QoNXjH5AotfHeN1qkYjjLUnjIWanZ1Mx++wJuwjiN3TdLd5 3dpVXJK6f0JmUhjK2YIEJIB/o9TmH7NgACVQA0h/P5VkvXKSEFdEQ4PjUcuE5PUNi/ro a08kHdpFmz3jiYZC+eXaWw6SnZnUIz1iDJo+T9EpIaa2Kz6YGFzoTzmopzEo+nahDVc/ TUKg== X-Gm-Message-State: AOAM533XKTXLeVi84UrU9BBeOyORiUIutsnKgm2ZQKS2BMQ9i3hJZ9Do VHr6BuDYfBsmRoumslHcW85TkQ== X-Google-Smtp-Source: ABdhPJzEwRYBYmx50KyPLxbXpPzMLdZUtiR4RWBfkd/2A9g86F+haXl3TmymKpxL7zb9SU127tPSJA== X-Received: by 2002:a5e:9612:: with SMTP id a18mr2732161ioq.209.1612996408710; Wed, 10 Feb 2021 14:33:28 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id e23sm1484525ioc.34.2021.02.10.14.33.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 14:33:28 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: elder@kernel.org, evgreen@chromium.org, bjorn.andersson@linaro.org, cpratapa@codeaurora.org, subashab@codeaurora.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/5] net: ipa: introduce gsi_channel_initialized() Date: Wed, 10 Feb 2021 16:33:20 -0600 Message-Id: <20210210223320.11269-6-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210210223320.11269-1-elder@linaro.org> References: <20210210223320.11269-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Create a simple helper function that indicates whether a channel has been initialized. This abstacts/hides the details of how this is determined. Signed-off-by: Alex Elder --- drivers/net/ipa/gsi.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c index d33686da15420..2406363bba2e8 100644 --- a/drivers/net/ipa/gsi.c +++ b/drivers/net/ipa/gsi.c @@ -175,6 +175,12 @@ static u32 gsi_channel_id(struct gsi_channel *channel) return channel - &channel->gsi->channel[0]; } +/* An initialized channel has a non-null GSI pointer */ +static bool gsi_channel_initialized(struct gsi_channel *channel) +{ + return !!channel->gsi; +} + /* Update the GSI IRQ type register with the cached value */ static void gsi_irq_type_update(struct gsi *gsi, u32 val) { @@ -1638,8 +1644,8 @@ static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id) u32 evt_ring_id = channel->evt_ring_id; int ret; - if (!channel->gsi) - return 0; /* Ignore uninitialized channels */ + if (!gsi_channel_initialized(channel)) + return 0; ret = gsi_evt_ring_alloc_command(gsi, evt_ring_id); if (ret) @@ -1675,8 +1681,8 @@ static void gsi_channel_teardown_one(struct gsi *gsi, u32 channel_id) struct gsi_channel *channel = &gsi->channel[channel_id]; u32 evt_ring_id = channel->evt_ring_id; - if (!channel->gsi) - return; /* Ignore uninitialized channels */ + if (!gsi_channel_initialized(channel)) + return; netif_napi_del(&channel->napi); @@ -1770,8 +1776,8 @@ static int gsi_channel_setup(struct gsi *gsi) while (channel_id < GSI_CHANNEL_COUNT_MAX) { struct gsi_channel *channel = &gsi->channel[channel_id++]; - if (!channel->gsi) - continue; /* Ignore uninitialized channels */ + if (!gsi_channel_initialized(channel)) + continue; dev_err(gsi->dev, "channel %u not supported by hardware\n", channel_id - 1); @@ -2088,8 +2094,8 @@ static int gsi_channel_init_one(struct gsi *gsi, /* Inverse of gsi_channel_init_one() */ static void gsi_channel_exit_one(struct gsi_channel *channel) { - if (!channel->gsi) - return; /* Ignore uninitialized channels */ + if (!gsi_channel_initialized(channel)) + return; if (channel->command) ipa_cmd_pool_exit(channel); -- 2.20.1