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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CCDAEC433EF for ; Sat, 15 Jan 2022 22:26:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6CEFA835FB; Sat, 15 Jan 2022 23:25:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jTwkel9k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7284E8354B; Sat, 15 Jan 2022 23:25:31 +0100 (CET) Received: from mail-qv1-xf34.google.com (mail-qv1-xf34.google.com [IPv6:2607:f8b0:4864:20::f34]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 04EA5835B3 for ; Sat, 15 Jan 2022 23:25:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qv1-xf34.google.com with SMTP id hu2so13887663qvb.8 for ; Sat, 15 Jan 2022 14:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4rnLRW6e+Sj+T5YPqx+0BK27nAtfvfliGz6EtIE/Vto=; b=jTwkel9keM4OBhxhhdFOdskNgcQcyohqlDGbCcdZsYhuKFsrRerdCCV6FnWsSoAXBf Lrwn2qQ8dDKVs+brHvnvqNEAWCDiNmFzddyD3LeskB0VvAAlTAXKPhPATYvubhMRkqKh jzeGHNPOzGdpMIlb/qI23VYGpL1GXevIsmlHwTyysj2U+LTGiKKBk7b2s9UFqETb8Dyu Q5L9qtmkgxc6iDdLBKl7PqHrpiYKoKIOuV/UPiq49DK1njaIQZJbJ9M/l8e0xIYH5mNT WS0T7dASbZvVAsvycUrqaJ61FkLuKCotF4Dx0FU4c4yQIMjj1EI2YjOjP45X7kWH3WI0 YBSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4rnLRW6e+Sj+T5YPqx+0BK27nAtfvfliGz6EtIE/Vto=; b=3NEVEel/TALjixA+7TqjuKsSkNNh4toHn0uuQSqRnOcOt6eWSit3r2+W9LuTc/M8cq we4w+s0l74CG/OGFDTf5cZXo3FB3dY1XW5EuhqsOSB186uPAzzAxgxmYgwYnn1z2FV/w 1klvZpwUmxd+XjqKDfQG6dAnP5ZtE47s9+Qn2bNyQHWgiu/xGxjEUphNjQ2K6kqFDVMr JPE30kk94OE3xnntyvZptGIefsXMAol3pgFH7cG3Zvv+qPc4/d2IzGsmRji0MNVDz9qm R/tKQqgj25sYwgo/eEVvQaXhxLkZ0jxtI10tCcHMHUmDRjVAyn9rzk9K/TPrZv/SnTUX zTxw== X-Gm-Message-State: AOAM532Q5xE0HVWLAyXWuHob53gxbla2eThNY7zKbz29TFtFYdoHQtvA 05Nvss2yblsp9d8FNBQqLRznx9a7qS0= X-Google-Smtp-Source: ABdhPJwJ2KVH809Fq67oDAscjds5FDPUa9bbEa+MSMxoGbX2t4Cmlc91i1Q0ffpoMzM5r/yrXCykmA== X-Received: by 2002:ad4:5b8e:: with SMTP id 14mr12994732qvp.95.1642285519658; Sat, 15 Jan 2022 14:25:19 -0800 (PST) Received: from godwin.fios-router.home (pool-108-18-137-133.washdc.fios.verizon.net. [108.18.137.133]) by smtp.gmail.com with ESMTPSA id ay15sm5991017qkb.63.2022.01.15.14.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jan 2022 14:25:19 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de Cc: Simon Glass , Lukasz Majewski , Sean Anderson Subject: [PATCH 7/7] clk: Make clk_free return void Date: Sat, 15 Jan 2022 17:25:04 -0500 Message-Id: <20220115222504.617013-8-seanga2@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220115222504.617013-1-seanga2@gmail.com> References: <20220115222504.617013-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Most callers of this function do not check the return value, and it is unclear what action they should take if it fails. If a function is freeing multiple clocks, it should not stop just because the first one failed. Since the callbacks can no longer fail, just convert the return type to void. Signed-off-by: Sean Anderson --- drivers/clk/clk-uclass.c | 10 ++++------ drivers/clk/clk_sandbox_test.c | 9 +++------ include/clk.h | 8 ++++---- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 61f977b661..5641709244 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -447,9 +447,7 @@ int clk_release_all(struct clk *clk, int count) if (ret && ret != -ENOSYS) return ret; - ret = clk_free(&clk[i]); - if (ret && ret != -ENOSYS) - return ret; + clk_free(&clk[i]); } return 0; @@ -472,18 +470,18 @@ int clk_request(struct udevice *dev, struct clk *clk) return ops->request(clk); } -int clk_free(struct clk *clk) +void clk_free(struct clk *clk) { const struct clk_ops *ops; debug("%s(clk=%p)\n", __func__, clk); if (!clk_valid(clk)) - return 0; + return; ops = clk_dev_ops(clk->dev); if (ops->rfree) ops->rfree(clk); - return 0; + return; } ulong clk_get_rate(struct clk *clk) diff --git a/drivers/clk/clk_sandbox_test.c b/drivers/clk/clk_sandbox_test.c index f665fd3cc4..5807a454f3 100644 --- a/drivers/clk/clk_sandbox_test.c +++ b/drivers/clk/clk_sandbox_test.c @@ -137,14 +137,11 @@ int sandbox_clk_test_disable_bulk(struct udevice *dev) int sandbox_clk_test_free(struct udevice *dev) { struct sandbox_clk_test *sbct = dev_get_priv(dev); - int i, ret; + int i; devm_clk_put(dev, sbct->clkps[SANDBOX_CLK_TEST_ID_DEVM1]); - for (i = 0; i < SANDBOX_CLK_TEST_NON_DEVM_COUNT; i++) { - ret = clk_free(&sbct->clks[i]); - if (ret) - return ret; - } + for (i = 0; i < SANDBOX_CLK_TEST_NON_DEVM_COUNT; i++) + clk_free(&sbct->clks[i]); return 0; } diff --git a/include/clk.h b/include/clk.h index 33f448eb89..79e7a9551f 100644 --- a/include/clk.h +++ b/include/clk.h @@ -396,9 +396,9 @@ int clk_request(struct udevice *dev, struct clk *clk); * @clk: A clock struct that was previously successfully requested by * clk_request/get_by_*(). * - * Return: 0 if OK, or a negative error code. + * Free resources allocated by clk_request() (or any clk_get_* function). */ -int clk_free(struct clk *clk); +void clk_free(struct clk *clk); /** * clk_get_rate() - Get current clock rate. @@ -545,9 +545,9 @@ static inline int clk_request(struct udevice *dev, struct clk *clk) return -ENOSYS; } -static inline int clk_free(struct clk *clk) +static inline void clk_free(struct clk *clk) { - return 0; + return; } static inline ulong clk_get_rate(struct clk *clk) -- 2.34.1