From patchwork Wed Feb 19 19:39:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1240971 X-Patchwork-Delegate: trini@ti.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=fKov2NlC; 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 48N7PJ5vBNz9sRN for ; Thu, 20 Feb 2020 06:40:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF5AB812F6; Wed, 19 Feb 2020 20:40:38 +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="fKov2NlC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BED2812CF; Wed, 19 Feb 2020 20:40:20 +0100 (CET) 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 autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (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 9AA06812C6 for ; Wed, 19 Feb 2020 20:40:08 +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=simon.k.r.goldschmidt@gmail.com Received: by mail-wm1-x342.google.com with SMTP id c84so1965969wme.4 for ; Wed, 19 Feb 2020 11:40:08 -0800 (PST) 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=M+rApFHvoynBFt32lGjErOhxtIjKZC5B6H6UKHspQkY=; b=fKov2NlCp9TXAfrHxjPB2n550hhuui9il1KpPFNPRxzvZInDoKyCNBL1hkRnjMYB10 xMEDklgj6v+Df88eOseEZBEWR0oqBpDA7wDNrDVvdi55n/i0L38CuHbbRU2m+ChzVr1k uNesf9gwoK97bA3ITaPj5SYUun8GqGDtDxgQJSqnZPzJChb8UqPInPosH7+QUTek34Ko j0vyBRA5S5inwDNYGPNDHbjDE0hDct0XFqvXtXMmYHYJEcxVp16VIk+qbxLWnJPGrKii yQJxuCFX80zQP2MBkBsVvFzuPzymtac709bLKfjQZrnKkZOBHet4bLE1JOuBTomtAbw5 ahMg== 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=M+rApFHvoynBFt32lGjErOhxtIjKZC5B6H6UKHspQkY=; b=EzlIwUoyrkw7uEy+d5Av8BaP1Zlre1BfzH1xoCtv8WizL2xanBhxuuwBcGFd52902g lx6X52WXFvN5VEARGzZ6fxqo++b2Iw21utEshu151fQjlSs5C47o5QJmBHWguPI8TVAy mJI75Wg4egotjdSFPLayFxFnq4/O9UlMen9d1mVA3JDXAhAN20nC2BCBX37Fno8T+wxZ F82iPt1LVxbrrM6ZRU9F7ZfxUo2HTWO+rNG2GEIqI5/g2e9pj4oOeqK87wfcltx/1QyZ lFvC5H+b4AZ+KPWEBaalYyQfHo6kZ7/MNwk1N/z1pbncfxouD6H4b+8qGeSLEvAYntxO QfEg== X-Gm-Message-State: APjAAAUMk2KKSMqYqS5EaIdFtubOwvnhmMAUq30z9uRMkfTNr7TNjqQ7 V5CLj8Nv2cwvNeyiJX4J39Y= X-Google-Smtp-Source: APXvYqxDkKQ6mytFLsq+UHMOIYBY1Ev9D4AEmaKcP3LUrpGvuaZORxncU/Xi7NLYmdesu4ED5fBtCg== X-Received: by 2002:a1c:a382:: with SMTP id m124mr11681815wme.90.1582141208104; Wed, 19 Feb 2020 11:40:08 -0800 (PST) Received: from ubuntu.home ([2a02:8071:6cd:f600:c8f1:bb29:e51c:220f]) by smtp.gmail.com with ESMTPSA id r6sm1066250wrp.95.2020.02.19.11.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 11:40:07 -0800 (PST) From: Simon Goldschmidt To: Simon Glass Cc: Tom Rini , Masahiro Yamada , u-boot@lists.denx.de, Simon Goldschmidt Subject: [PATCH 4/8] Revert "clk: Rename free() to rfree()" Date: Wed, 19 Feb 2020 20:39:30 +0100 Message-Id: <20200219193934.28456-5-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200219193934.28456-1-simon.k.r.goldschmidt@gmail.com> References: <20200219193934.28456-1-simon.k.r.goldschmidt@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 This reverts commit fb8c0d595f1ad83bee5dd398b59b0ee16d8d15a9. Signed-off-by: Simon Goldschmidt Reviewed-by: Simon Glass --- drivers/clk/clk-ti-sci.c | 2 +- drivers/clk/clk-uclass.c | 4 ++-- drivers/clk/clk_sandbox.c | 2 +- drivers/clk/tegra/tegra-car-clk.c | 2 +- include/clk-uclass.h | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c index 82241d9f3f..e272003d30 100644 --- a/drivers/clk/clk-ti-sci.c +++ b/drivers/clk/clk-ti-sci.c @@ -206,7 +206,7 @@ static const struct udevice_id ti_sci_clk_of_match[] = { static struct clk_ops ti_sci_clk_ops = { .of_xlate = ti_sci_clk_of_xlate, .request = ti_sci_clk_request, - .rfree = ti_sci_clk_free, + .free = ti_sci_clk_free, .get_rate = ti_sci_clk_get_rate, .set_rate = ti_sci_clk_set_rate, .set_parent = ti_sci_clk_set_parent, diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 71878474eb..24353fae53 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -426,10 +426,10 @@ int clk_free(struct clk *clk) return 0; ops = clk_dev_ops(clk->dev); - if (!ops->rfree) + if (!ops->free) return 0; - return ops->rfree(clk); + return ops->free(clk); } ulong clk_get_rate(struct clk *clk) diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c index 768fbb7c52..7059979606 100644 --- a/drivers/clk/clk_sandbox.c +++ b/drivers/clk/clk_sandbox.c @@ -108,7 +108,7 @@ static struct clk_ops sandbox_clk_ops = { .enable = sandbox_clk_enable, .disable = sandbox_clk_disable, .request = sandbox_clk_request, - .rfree = sandbox_clk_free, + .free = sandbox_clk_free, }; static int sandbox_clk_probe(struct udevice *dev) diff --git a/drivers/clk/tegra/tegra-car-clk.c b/drivers/clk/tegra/tegra-car-clk.c index 6083f14e75..1f0e2dc95b 100644 --- a/drivers/clk/tegra/tegra-car-clk.c +++ b/drivers/clk/tegra/tegra-car-clk.c @@ -81,7 +81,7 @@ static int tegra_car_clk_disable(struct clk *clk) static struct clk_ops tegra_car_clk_ops = { .request = tegra_car_clk_request, - .rfree = tegra_car_clk_free, + .free = tegra_car_clk_free, .get_rate = tegra_car_clk_get_rate, .set_rate = tegra_car_clk_set_rate, .enable = tegra_car_clk_enable, diff --git a/include/clk-uclass.h b/include/clk-uclass.h index dac42dab36..e76d98e2f6 100644 --- a/include/clk-uclass.h +++ b/include/clk-uclass.h @@ -53,14 +53,14 @@ struct clk_ops { */ int (*request)(struct clk *clock); /** - * rfree - Free a previously requested clock. + * free - Free a previously requested clock. * * This is the implementation of the client clk_free() API. * * @clock: The clock to free. * @return 0 if OK, or a negative error code. */ - int (*rfree)(struct clk *clock); + int (*free)(struct clk *clock); /** * get_rate() - Get current clock rate. *