From patchwork Wed May 20 06:40:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1294009 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pMeSCdUO; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49Rjq24TVfz9sT8 for ; Wed, 20 May 2020 16:42:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 49BAD81E84; Wed, 20 May 2020 08:41:39 +0200 (CEST) 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="pMeSCdUO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7083B81E79; Wed, 20 May 2020 08:41:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) (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 88B3A81DA3 for ; Wed, 20 May 2020 08:41:23 +0200 (CEST) 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-x744.google.com with SMTP id f189so2541827qkd.5 for ; Tue, 19 May 2020 23:41:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4+RPmqLgaZon4F2CiJZ+nWgLdufJOkdqschePSWzdZM=; b=pMeSCdUOp8cJWsALX1Sbp0TJn8Fl4iZquHTpumYqYtt6WdfQNSg3Fd4DaHidxRBP6i 59E8Hk72dL27PYPjx31n+XLmM5LxhbFcizM6PwfvZDxb5OviLrRD4LIIYlkyNsdVvxr5 bI5BB2Uyr+geGZOFi3ZANO/5h02dDzztWCWkA2HcJAlN5XFnKegGEAnjoe0+naS2R2h2 rMH5DccEmYSIxxln2pbtChURlZB91lXDo/CHm3QQ1tQd3UQR6nfqEzS7sVwm313064wd 3BBHpa781QR3HebNy2LJ6dyLtwX5BC4nDbS4W29kiE10xRyWe/R+dfQZf33rqMKBltvW S8gA== 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=4+RPmqLgaZon4F2CiJZ+nWgLdufJOkdqschePSWzdZM=; b=nT2f1nD244KMlZEGvYIud6H1b7Z+530D08+z4XBZDeoCgtX/9CO4Ph89lyMkaFJLly LSTt/rBA7AznXJkhz04vRQTAYXmLQbxDpI49Kgw6HJ90uiCu+L3LRzhmyZoFAcZqKv5t z29GvCOM8f22Ac8Sdkbh/H1quQAoTb6voiRcKzi3Jafc9UYeS5lPpAYBzXIZIVzAAlkD 2aL9czXlqBw44rCXjXy7xQgP6I2uVyOsJaqvHnWuGQcd3gXl1xhXGdA/fZSjYGO5cifL sy7pC9kNHlL8cr1nUT00Z3iQTFFoPGu2jVJCZ3cwFna/5gvYpOkRODjTDn5pYzKCSeYb pXzg== X-Gm-Message-State: AOAM530mKy3t5KfW++RGKKfCm4VwzMecp6rcjzgMk/7Zp5ZqpK+hrrJn L+7mOW35jrbzcFsg2Gp+sVigwG5xzJXYzg== X-Google-Smtp-Source: ABdhPJwCLrYd9vO5bcs0MXUu0sH8ukYqie6e3zqXf41rm2ojT4fC/2ZmYOzYDukgyq1NH0L/nzyn9A== X-Received: by 2002:a05:620a:1584:: with SMTP id d4mr3172214qkk.170.1589956882271; Tue, 19 May 2020 23:41:22 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id i59sm1600393qtb.58.2020.05.19.23.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 23:41:21 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Rick Chen , Bin Meng , Sean Anderson , Lukasz Majewski Subject: [PATCH v11 04/21] clk: Fix clk_get_by_* handling of index Date: Wed, 20 May 2020 02:40:54 -0400 Message-Id: <20200520064111.317605-5-seanga2@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200520064111.317605-1-seanga2@gmail.com> References: <20200520064111.317605-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean clk_get_by_index_nodev only ever fetched clock 1, due to passing a boolean predicate instead of the index. Other clk_get_by_* functions got the clock correctly, but passed a predicate instead of the index to clk_get_by_tail. This could lead to confusing error messages. Signed-off-by: Sean Anderson CC: Lukasz Majewski --- Changes in v7: - New drivers/clk/clk-uclass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 774d6ccdf8..ac725abfdf 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -123,7 +123,7 @@ static int clk_get_by_indexed_prop(struct udevice *dev, const char *prop_name, return clk_get_by_index_tail(ret, dev_ofnode(dev), &args, "clocks", - index > 0, clk); + index, clk); } int clk_get_by_index(struct udevice *dev, int index, struct clk *clk) @@ -135,7 +135,7 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk) index, &args); return clk_get_by_index_tail(ret, dev_ofnode(dev), &args, "clocks", - index > 0, clk); + index, clk); } int clk_get_by_index_nodev(ofnode node, int index, struct clk *clk) @@ -144,10 +144,10 @@ int clk_get_by_index_nodev(ofnode node, int index, struct clk *clk) int ret; ret = ofnode_parse_phandle_with_args(node, "clocks", "#clock-cells", 0, - index > 0, &args); + index, &args); return clk_get_by_index_tail(ret, node, &args, "clocks", - index > 0, clk); + index, clk); } int clk_get_bulk(struct udevice *dev, struct clk_bulk *bulk)