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 32AADC433F5 for ; Thu, 2 Dec 2021 14:25:14 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4D7A2811AC; Thu, 2 Dec 2021 15:25:12 +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="eZdbVtWw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E23E3811B3; Thu, 2 Dec 2021 15:25:08 +0100 (CET) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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 BC89E810F3 for ; Thu, 2 Dec 2021 15:25:04 +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-qk1-x732.google.com with SMTP id q64so19057qkd.5 for ; Thu, 02 Dec 2021 06:25:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=xKDCeO8iGMJK/qX1HDB4dKDCOXMx91DN9tixiCeteZo=; b=eZdbVtWw6/T8GSsEyqam7TOBwISRmRDs4Xv02SOq57vdc2eKaMm996voJnEIest2GQ l5nNPJ128RDgSJnzI7tWkfwWq8YGD023/5j3iq2YVngyF1m0ENwY8ZChH/MXHKXGoPHb G119r9lvocvlQ9Z4IpCPKJSu63QjB5QndvJ2t7RJbXF4mhTrY9nILiMCa91CKE1SiuQL PezOPwlacZK/xhLk9vCljpsD100dBYAu9SRDDCpgQZ2Dg9MHjhczYAjz03ZvNJQrs1LH aQp12Jh/AmX1SgRKU2JQZtfVHQDuPQbrX+UWeO7aIGveaSsbDF6WcbdwqkzQbGKKDOxV 6lhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=xKDCeO8iGMJK/qX1HDB4dKDCOXMx91DN9tixiCeteZo=; b=TFhZs1Ry3MFuR6VwpiQEseHQtlck3AA6UCaYBpoRIKxpqyey/fS/JBmPuaxt1UZd8F spLKUKCi79pgYi2hNY67wP8nTVH2hOJjvKmSrXuanrjZ/woDRAF2rcka44ippa8CKk6G KP0f8UPbuVNNizNuBL7dpeWybYUVGAjvVqfMnAM23/xORS9D3NWUPHwKISFHUOJYFh5m H0meP2amb2Tum9zt+h895HiYdluLLhIrHuQ6Lmetm/SB03m9qqKiEHzf0dEGEEUKfGlu Pd1CEI5bBjkFF7MdxR1CSqkjAjlYsKXXHKKZLtrsWPlI+sarGKcWT9+TXUQTKtGNA5df zOAg== X-Gm-Message-State: AOAM533m5Jnj2FPBDjsS/scVtdem0RX++LNbmm5nH7UpRQnU3voXm5QF BUw6o8Q8GuihDBWyyEplQag= X-Google-Smtp-Source: ABdhPJy8EtwoE8OzyT7wcX+vSUzr5K+fa6W2i7b+rjsCunT0JXWUKBuCJQP4iZjMzjxH7gdnMTKWRA== X-Received: by 2002:ae9:e317:: with SMTP id v23mr12431379qkf.446.1638455103273; Thu, 02 Dec 2021 06:25:03 -0800 (PST) Received: from [192.168.1.201] (pool-108-18-207-184.washdc.fios.verizon.net. [108.18.207.184]) by smtp.googlemail.com with ESMTPSA id u10sm1590515qkp.104.2021.12.02.06.25.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Dec 2021 06:25:02 -0800 (PST) From: Sean Anderson Subject: Re: [PATCH 5/5] clk: Add clk_get_by_name_optional To: Simon Glass Cc: u-boot@lists.denx.de, Dario Binacchi , Lukasz Majewski , Michal Simek , Neil Armstrong , u-boot-amlogic@groups.io References: <20211201184332.2166897-1-seanga2@gmail.com> <20211201184332.2166897-6-seanga2@gmail.com> Message-ID: <1528d504-21d5-97da-27bf-a6101044f776@gmail.com> Date: Thu, 2 Dec 2021 09:25:01 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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 Hi Simon, On 12/2/21 8:43 AM, Simon Glass wrote: > Hi Sean, > > On Wed, 1 Dec 2021 at 11:43, Sean Anderson wrote: >> >> This adds a helper function for clk_get_by_name in cases where the clock is >> optional. Hopefully this helps point driver writers in the right direction. >> Also convert some existing users. >> >> Signed-off-by: Sean Anderson >> --- >> >> drivers/clk/clk_zynq.c | 5 +++-- >> drivers/rng/meson-rng.c | 4 ++-- >> include/clk.h | 24 ++++++++++++++++++++++++ >> 3 files changed, 29 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c >> index 18915c3e04..e80500e382 100644 >> --- a/drivers/clk/clk_zynq.c >> +++ b/drivers/clk/clk_zynq.c >> @@ -472,8 +472,9 @@ static int zynq_clk_probe(struct udevice *dev) >> >> for (i = 0; i < 2; i++) { >> sprintf(name, "gem%d_emio_clk", i); >> - ret = clk_get_by_name(dev, name, &priv->gem_emio_clk[i]); >> - if (ret < 0 && ret != -ENODATA) { >> + ret = clk_get_by_name_optional(dev, name, >> + &priv->gem_emio_clk[i]); >> + if (ret) { >> dev_err(dev, "failed to get %s clock\n", name); >> return ret; >> } >> diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c >> index 5a4f45ad5a..e0a1e8c7e0 100644 >> --- a/drivers/rng/meson-rng.c >> +++ b/drivers/rng/meson-rng.c >> @@ -91,8 +91,8 @@ static int meson_rng_of_to_plat(struct udevice *dev) >> return -ENODEV; >> >> /* Get optional "core" clock */ >> - err = clk_get_by_name(dev, "core", &pdata->clk); >> - if (err && err != -ENODATA) >> + err = clk_get_by_name_optional(dev, "core", &pdata->clk); >> + if (err) >> return err; >> >> return 0; >> diff --git a/include/clk.h b/include/clk.h >> index 103ef16bf9..36721188d0 100644 >> --- a/include/clk.h >> +++ b/include/clk.h >> @@ -292,6 +292,30 @@ static inline int clk_release_all(struct clk *clk, int count) >> } >> #endif >> >> +/** >> + * clk_get_by_name_optional() - Get/request a optional clock by name. > > Can I suggest we rename this to ..._opt as it is shorter? This follows the general trend of suffixing _optional. For example (and several of these are borrowed from Linux): clk_get_optional reset_control_bulk_get_optional_exclusive gpiod_get_optional platform_get_irq_byname_optional and particularly, the Linux clock subsystem uses _optional and not _opt as a suffix. While some of these names can get fairly long-winded, I think we should go for consistency here. --Sean >> + * @dev: The client device. >> + * @name: The name of the clock to request, within the client's list of >> + * clocks. >> + * @clk: A pointer to a clock struct to initialize. >> + * >> + * Behaves the same as clk_get_by_name(), except when there is no clock >> + * provider. In the latter case, return 0. >> + * >> + * Return: 0 if OK, or a negative error code. >> + */ >> +static inline int clk_get_by_name_optional(struct udevice *dev, >> + const char *name, struct clk *clk) >> +{ >> + int ret; >> + >> + ret = clk_get_by_name_optional(dev, name, clk); >> + if (ret == -ENODATA) >> + return 0; >> + >> + return ret; >> +} >> + >> /** >> * clk_get_by_name_nodev_optional - Get/request an optinonal clock by name >> * without a device. >> -- >> 2.33.0 >> > > Regards, > SImon >