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 3580CC4321A for ; Fri, 15 Jan 2021 12:51:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EAF5221F7 for ; Fri, 15 Jan 2021 12:51:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728637AbhAOMvo (ORCPT ); Fri, 15 Jan 2021 07:51:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388020AbhAOMvk (ORCPT ); Fri, 15 Jan 2021 07:51:40 -0500 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 759BFC061795 for ; Fri, 15 Jan 2021 04:50:56 -0800 (PST) Received: by mail-io1-xd34.google.com with SMTP id q1so17814060ion.8 for ; Fri, 15 Jan 2021 04:50:56 -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=HRs/Iw+fbNuG8BHg7jc2ZIXfDTbwOS1IIxrJncMvSjg=; b=vdAI/v/v3LmO73rs7BW4NJVaNk7yg1dQ8bxJJzj22+Vp4S361PRxFY0sNlgk5FAQZM xjuPwlEScjBhwGakNasyqKq+aUY7z6EzW6jaUEE+zmKn13gjDDxBw3yIRSolzxU4fkS/ XAmnuyimEbNkvM7Y3DOyiA5yIJsoeniAj+Djc7GEu5joK69d+NEcyCKsFDUED3qZ+8ty O4Ex/Pb+Aw4X0gFyhJrrRGrNN6ySjNubAMO2g9ALqN5nQfzjVXiUUvmTVgewFeDsPHwe FfpuEn97l0rPXPNMWHtIfW3dGosKFGLvxXAQOM88j6RBnMR6A4O4gAKh4A9HZaixo/H8 ZjZA== 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=HRs/Iw+fbNuG8BHg7jc2ZIXfDTbwOS1IIxrJncMvSjg=; b=TgYYPPHrYWMJ3pytVXw50QKufFC7l9Q7heAs9PPpTF/TxQn4X/DRaOTfSwariIWuTt 6y03y5YpuzLD2KhDIBvSXRJYffJzrPb1oM+yvelCwu9fTVY17MKqbtlg0kIXtYLwVzc9 rWQp4eg7Q4GbkJj49eFKzwWDwl+WdSoCN1qZP0DSTmJkEoEE5LW4etsomXPcHQ0smFtn RIa/ewb156NMTlDRqnyVZQC0FStcLvRbvcIIh+X8d8jpNGJwUIGCS80MPwAskaWUUdAq 6HcghSTxkPG/25ontVxMp5LIONRD9LdMDkuFYMf3/9kPjmQ2KoJ6BhueDQ0H35FBSEYs PLDg== X-Gm-Message-State: AOAM531yT+tWT6oFvr70Sag5slcHfIhzbkLEh5tyTuiEWJxW/XU4iGOm mL1aEJKaXlEXYkudbPzolp7/OQ== X-Google-Smtp-Source: ABdhPJwD8SHUlItoDEVDMzPNd2f5xs18pT2Era3KTeFnsDMcbKI1/bvyDFawqmdv3L6EZ8EYv+CCIA== X-Received: by 2002:a05:6e02:1a25:: with SMTP id g5mr10740701ile.2.1610715055898; Fri, 15 Jan 2021 04:50:55 -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 f13sm3952450iog.18.2021.01.15.04.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 04:50:55 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: 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 2/7] net: ipa: don't return an error from ipa_interconnect_disable() Date: Fri, 15 Jan 2021 06:50:45 -0600 Message-Id: <20210115125050.20555-3-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210115125050.20555-1-elder@linaro.org> References: <20210115125050.20555-1-elder@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If disabling interconnects fails there's not a lot we can do. The only two callers of ipa_interconnect_disable() ignore the return value, so just give the function a void return type. Print an error message if disabling any of the interconnects is not successful. Return (and print) only the first error seen. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_clock.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/drivers/net/ipa/ipa_clock.c b/drivers/net/ipa/ipa_clock.c index 459c357e09678..baedb481fe824 100644 --- a/drivers/net/ipa/ipa_clock.c +++ b/drivers/net/ipa/ipa_clock.c @@ -137,36 +137,27 @@ static int ipa_interconnect_enable(struct ipa *ipa) } /* To disable an interconnect, we just its bandwidth to 0 */ -static int ipa_interconnect_disable(struct ipa *ipa) +static void ipa_interconnect_disable(struct ipa *ipa) { - const struct ipa_interconnect_data *data; struct ipa_clock *clock = ipa->clock; + int result = 0; int ret; ret = icc_set_bw(clock->memory_path, 0, 0); if (ret) - return ret; + result = ret; ret = icc_set_bw(clock->imem_path, 0, 0); - if (ret) - goto err_memory_path_reenable; + if (ret && !result) + result = ret; ret = icc_set_bw(clock->config_path, 0, 0); - if (ret) - goto err_imem_path_reenable; + if (ret && !result) + result = ret; - return 0; - -err_imem_path_reenable: - data = &clock->interconnect_data[IPA_INTERCONNECT_IMEM]; - (void)icc_set_bw(clock->imem_path, data->average_bandwidth, - data->peak_bandwidth); -err_memory_path_reenable: - data = &clock->interconnect_data[IPA_INTERCONNECT_MEMORY]; - (void)icc_set_bw(clock->memory_path, data->average_bandwidth, - data->peak_bandwidth); - - return ret; + if (result) + dev_err(&ipa->pdev->dev, + "error %d disabling IPA interconnects\n", ret); } /* Turn on IPA clocks, including interconnects */ @@ -189,7 +180,7 @@ static int ipa_clock_enable(struct ipa *ipa) static void ipa_clock_disable(struct ipa *ipa) { clk_disable_unprepare(ipa->clock->core); - (void)ipa_interconnect_disable(ipa); + ipa_interconnect_disable(ipa); } /* Get an IPA clock reference, but only if the reference count is -- 2.20.1